Device Linking and better linking ui (#13645)

Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com> Co-authored-by: Visne <39844191+Visne@users.noreply.github.com> Co-authored-by: ElectroJr <leonsfriedrich@gmail.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-05-07 08:07:24 +02:00
parent 2fe7055de6
commit 6ebd784cb6
100 changed files with 2096 additions and 342 deletions
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -11,6 +11,7 @@
  - type: Clothing
    sprite: Clothing/Belt/utility.rsi
  - type: Storage
+    capacity: 45
    # TODO: Fill this out more.
    whitelist:
      tags:
@@ -26,10 +27,11 @@
        - CigPack
        - Radio
        - HolofanProjector
+        - Multitool
        - AppraisalTool
      components:
        - AirlockPainter
-        - SignalLinker
+        - NetworkConfigurator
        - RCD
        - RCDAmmo
        - Welder
@@ -63,8 +65,8 @@
          - Wrench
      multitool:
        whitelist:
-          components:
-          - SignalLinker
+          tags:
+            - Multitool
    sprite: Clothing/Belt/belt_overlay.rsi
  - type: Appearance

@@ -79,7 +81,7 @@
  - type: Clothing
    sprite: Clothing/Belt/ce.rsi
  - type: Storage
-    capacity: 100
+    capacity: 105
    # TODO: Fill this out more.
    whitelist:
      tags:
@@ -96,10 +98,11 @@
        - CigPack
        - Radio
        - HolofanProjector
+        - Multitool
        - AppraisalTool
      components:
        - AirlockPainter
-        - SignalLinker
+        - NetworkConfigurator
        - RCD
        - RCDAmmo
        - Welder
@@ -135,8 +138,8 @@
          - Screwdriver
      multitool:
        whitelist:
-          components:
-          - SignalLinker
+          tags:
+            - Multitool
      wrench:
        whitelist:
          tags:
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
@@ -13,9 +13,9 @@
  - type: UseDelay
  - type: StaticPrice
    price: 40
-  - type: SignalTransmitter
-    outputs:
-      Pressed: []
+  - type: DeviceLinkSource
+    ports:
+      - Pressed
  - type: Tag
    tags:
    - Payload
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
@@ -42,7 +42,12 @@
  - type: PayloadTrigger
    components:
    - type: TriggerOnSignal
-    - type: SignalReceiver
+    - type: DeviceNetwork
+      deviceNetId: Wireless
+      receiveFrequencyId: BasicDevice
+    - type: WirelessNetworkConnection
+      range: 200
+    - type: DeviceLinkSink
    - type: StaticPrice
      price: 40

--- a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
@@ -108,7 +108,9 @@
  - type: Tool
    qualities:
    - Pulsing
-  - type: SignalLinker
+  - type: Tag
+    tags:
+      - Multitool

 - type: entity
  name: cowelding tool
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -196,21 +196,9 @@
  - type: Tool
    qualities:
      - Pulsing
-  - type: SignalLinker
-  - type: NetworkConfigurator
-  - type: ActivatableUI
-    key: enum.NetworkConfiguratorUiKey.List
-    inHandsOnly: true
-  - type: UserInterface
-    interfaces:
-    - key: enum.SignalLinkerUiKey.Key
-      type: SignalPortSelectorBoundUserInterface
-    - key: enum.NetworkConfiguratorUiKey.List
-      type: NetworkConfiguratorBoundUserInterface
-    - key: enum.NetworkConfiguratorUiKey.Configure
-      type: NetworkConfiguratorBoundUserInterface
  - type: Tag
    tags:
+      - Multitool
      - DroneUsable
  - type: PhysicalComposition
    materialComposition:
@@ -219,6 +207,54 @@
  - type: StaticPrice
    price: 60

+- type: entity
+  name: network configurator
+  parent: BaseItem
+  id: NetworkConfigurator
+  description: A tool for linking devices together. Has two modes, a list mode for mass linking devices and a linking mode for advanced device linking.
+  components:
+    - type: EmitSoundOnLand
+      sound:
+        path: /Audio/Items/multitool_drop.ogg
+    - type: Sprite
+      sprite: Objects/Tools/network_configurator.rsi
+      layers:
+        - state: icon
+        - state: mode-list
+          map: ["enum.NetworkConfiguratorLayers.ModeLight"]
+          shader: unshaded
+    - type: Item
+      size: 5
+    - type: Clothing
+      sprite: Objects/Tools/network_configurator.rsi
+      quickEquip: false
+      slots:
+        - Belt
+    - type: Appearance
+    - type: GenericVisualizer
+      visuals:
+        enum.NetworkConfiguratorVisuals.Mode:
+          enum.NetworkConfiguratorLayers.ModeLight:
+            True: { state: mode-link }
+            False: { state: mode-list }
+    - type: NetworkConfigurator
+    - type: ActivatableUI
+      key: enum.NetworkConfiguratorUiKey.List
+      inHandsOnly: true
+    - type: UserInterface
+      interfaces:
+        - key: enum.NetworkConfiguratorUiKey.List
+          type: NetworkConfiguratorBoundUserInterface
+        - key: enum.NetworkConfiguratorUiKey.Configure
+          type: NetworkConfiguratorBoundUserInterface
+        - key: enum.NetworkConfiguratorUiKey.Link
+          type: NetworkConfiguratorBoundUserInterface
+    - type: Tag
+      tags:
+        - DroneUsable
+    - type: StaticPrice
+      price: 60
+
 - type: entity
  name: power drill
  parent: BaseItem
@@ -371,13 +407,10 @@
  - type: Item
    sprite: Objects/Tools/omnitool.rsi
    size: 20
+  - type: Tag
+    tags:
+    - Multitool
  - type: TilePrying
-  - type: SignalLinker
-    requiredQuality: Pulsing
-  - type: UserInterface
-    interfaces:
-      - key: enum.SignalLinkerUiKey.Key
-        type: SignalPortSelectorBoundUserInterface
  - type: Tool
    qualities:
      - Screwing
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
@@ -18,9 +18,9 @@
      startOnStick: true
      canToggleStartOnStick: true
    - type: TriggerOnSignal
-    - type: SignalReceiver
-      inputs:
-        Trigger: []
+    - type: DeviceLinkSink
+      ports:
+        - Trigger
    - type: Sticky
      stickDelay: 5
      unstickDelay: 5
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -78,12 +78,17 @@
    BoardName: "Airlock Control"
    LayoutId: Airlock
  - type: DoorSignalControl
-  - type: SignalReceiver
-    inputs:
-      Open: []
-      Close: []
-      Toggle: []
-      AutoClose: []
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: BasicDevice
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: DeviceLinkSink
+    ports:
+      - Open
+      - Close
+      - Toggle
+      - AutoClose
  - type: UserInterface
    interfaces:
    - key: enum.WiresUiKey.Key
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
@@ -76,11 +76,16 @@
    key: walls
    mode: NoSprite
  - type: DoorSignalControl
-  - type: SignalReceiver
-    inputs:
-      Open: []
-      Close: []
-      Toggle: []
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: BasicDevice
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: DeviceLinkSink
+    ports:
+      - Open
+      - Close
+      - Toggle
  - type: InteractionPopup
    interactSuccessString: comp-window-knock
    messagePerceivedByOthers: comp-window-knock
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
@@ -46,12 +46,17 @@
  - type: ApcPowerReceiver
  - type: ExtensionCableReceiver
  - type: DoorSignalControl
-  - type: SignalReceiver
-    inputs:
-      Open: []
-      Close: []
-      Toggle: []
-      AutoClose: []
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: BasicDevice
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: DeviceLinkSink
+    ports:
+      - Open
+      - Close
+      - Toggle
+      - AutoClose
  - type: Damageable
    damageContainer: Inorganic
    damageModifierSet: Glass
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -86,18 +86,19 @@
  - type: ApcPowerReceiver
  - type: ExtensionCableReceiver
  - type: DeviceNetwork
-    deviceNetId: Apc
+    deviceNetId: Wireless
    receiveFrequencyId: SmartLight
-  - type: ApcNetworkConnection
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: DeviceLinkSink
+    ports:
+      - On
+      - Off
+      - Toggle
  - type: Appearance
  - type: PoweredLightVisuals
    blinkingSound:
      path: "/Audio/Machines/light_tube_on.ogg"
-  - type: SignalReceiver
-    inputs:
-      On: []
-      Off: []
-      Toggle: []

 - type: entity
  id: Poweredlight
@@ -266,16 +267,17 @@
  - type: ApcPowerReceiver
  - type: ExtensionCableReceiver
  - type: DeviceNetwork
-    deviceNetId: Apc
+    deviceNetId: Wireless
    receiveFrequencyId: SmartLight
-  - type: ApcNetworkConnection
+  - type: WirelessNetworkConnection
+    range: 200
  - type: Appearance
  - type: PoweredLightVisuals
-  - type: SignalReceiver
-    inputs:
-      On: []
-      Off: []
-      Toggle: []
+  - type: DeviceLinkSink
+    ports:
+      - On
+      - Off
+      - Toggle

 - type: entity
  id: PoweredSmallLight
--- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
@@ -91,9 +91,15 @@
  - type: ApcPowerReceiver
  - type: ExtensionCableReceiver
  - type: DeviceNetwork
-    deviceNetId: Apc
+    deviceNetId: Wireless
    receiveFrequencyId: SmartLight
-  - type: ApcNetworkConnection
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: DeviceLinkSink
+    ports:
+      - On
+      - Off
+      - Toggle
  - type: Construction
    graph: LightFixture
    node: groundLight
@@ -101,11 +107,6 @@
  - type: PoweredLightVisuals
    blinkingSound:
      path: "/Audio/Machines/light_tube_on.ogg"
-  - type: SignalReceiver
-    inputs:
-      On: []
-      Off: []
-      Toggle: []

 - type: entity
  id: PoweredLightPostSmall
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -378,10 +378,10 @@
  - type: DeviceList
  - type: DeviceNetwork
    deviceNetId: Wired
-  - type: SignalTransmitter
-    transmissionRange: 5
-    outputs:
-      ArtifactAnalyzerSender: []
+  - type: DeviceLinkSource
+    range: 5
+    ports:
+      - ArtifactAnalyzerSender
  - type: ActivatableUI
    key: enum.ArtifactAnalzyerUiKey.Key
  - type: UserInterface
@@ -698,11 +698,11 @@
    radius: 1.5
    energy: 1.6
    color: "#1f8c28"
-  - type: SignalTransmitter
-    transmissionRange: 4
-    outputs:
-      MedicalScannerSender: []
-      CloningPodSender: []
+  - type: DeviceLinkSource
+    range: 4
+    ports:
+      - MedicalScannerSender
+      - CloningPodSender
  - type: ActivatableUI
    key: enum.CloningConsoleUiKey.Key
  - type: UserInterface
--- a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
@@ -49,10 +49,11 @@
  - type: ArtifactAnalyzer
  - type: DeviceNetwork
    deviceNetId: Wired
+    receiveFrequencyId: BasicDevice
  - type: DeviceList
-  - type: SignalReceiver
-    inputs:
-      ArtifactAnalyzerReceiver: []
+  - type: DeviceLinkSink
+    ports:
+      - ArtifactAnalyzerReceiver
  - type: Machine
    board: ArtifactAnalyzerMachineCircuitboard
  - type: PointLight
--- a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
@@ -8,6 +8,10 @@
  - type: DeviceList
  - type: DeviceNetwork
    deviceNetId: Wired
+    receiveFrequencyId: BasicDevice
+  - type: DeviceLinkSink
+    ports:
+      - CloningPodReceiver
  - type: Sprite
    netsync: false
    sprite: Structures/Machines/cloning.rsi
@@ -34,9 +38,6 @@
     - machine_board
     - machine_parts
     - clonepod-bodyContainer
-  - type: SignalReceiver
-    inputs:
-      CloningPodReceiver: []
  - type: EmptyOnMachineDeconstruct
    containers:
      - clonepod-bodyContainer
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -74,6 +74,7 @@
      - Wrench
      - Crowbar
      - Multitool
+      - NetworkConfigurator
      - AirlockPainter
      - CableStack
      - HandheldGPSBasic
--- a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
@@ -7,7 +7,11 @@
  - type: MedicalScanner
  - type: DeviceNetwork
    deviceNetId: Wired
+    receiveFrequencyId: BasicDevice
  - type: DeviceList
+  - type: DeviceLinkSink
+    ports:
+      - MedicalScannerReceiver
  - type: Sprite
    netsync: false
    sprite: Structures/Machines/scanner.rsi
@@ -58,9 +62,6 @@
      scanner-bodyContainer: !type:ContainerSlot
      machine_board: !type:Container
      machine_parts: !type:Container
-  - type: SignalReceiver
-    inputs:
-      MedicalScannerReceiver: []
  - type: Damageable
    damageContainer: Inorganic
    damageModifierSet: StrongMetallic
--- a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
@@ -42,11 +42,11 @@
        - MidImpassable
        - LowImpassable
        hard: False
-  - type: SignalReceiver
-    inputs:
-      Reverse: []
-      Forward: []
-      Off: []
+  - type: DeviceLinkSink
+    ports:
+      - Reverse
+      - Forward
+      - Off
  - type: Transform
    anchored: true
    noRot: false
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
@@ -208,11 +208,16 @@
  - type: PipeColorVisuals
  - type: GasValve
  - type: SignalControlledValve
-  - type: SignalReceiver
-    inputs:
-      Open: []
-      Close: []
-      Toggle: []
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: BasicDevice
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: DeviceLinkSink
+    ports:
+      - Open
+      - Close
+      - Toggle
  - type: NodeContainer
    nodes:
      inlet:
@@ -296,10 +301,15 @@
      inlet: inlet
      outlet: outlet
      canLink: true
-    - type: SignalReceiver
-      inputs:
-        Pressurize: []
-        Depressurize: []
+    - type: DeviceNetwork
+      deviceNetId: Wireless
+      receiveFrequencyId: BasicDevice
+    - type: WirelessNetworkConnection
+      range: 200
+    - type: DeviceLinkSink
+      ports:
+        - Pressurize
+        - Depressurize
    - type: Construction
      graph: GasBinary
      node: dualportventpump
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
@@ -24,10 +24,14 @@
    graph: SignalSwitchGraph
    node: SignalSwitchNode
  - type: Fixtures
-  - type: SignalTransmitter
-    outputs:
-      On: []
-      Off: []
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: DeviceLinkSource
+    ports:
+      - On
+      - Off

 - type: entity
  id: SignalButton
@@ -57,9 +61,13 @@
    graph: SignalButtonGraph
    node: SignalButtonNode
  - type: Fixtures
-  - type: SignalTransmitter
-    outputs:
-      Pressed: []
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: DeviceLinkSource
+    ports:
+      - Pressed
  - type: Damageable
    damageContainer: Inorganic
    damageModifierSet: Metallic
@@ -153,8 +161,12 @@
    - type: Construction
      graph: LeverGraph
      node: LeverNode
-    - type: SignalTransmitter
-      outputs:
-        Left: []
-        Right: []
-        Middle: []
+    - type: DeviceNetwork
+      deviceNetId: Wireless
+    - type: WirelessNetworkConnection
+      range: 200
+    - type: DeviceLinkSource
+      ports:
+        - Left
+        - Right
+        - Middle
--- a/Resources/Prototypes/Entities/Structures/cargo_console.yml
+++ b/Resources/Prototypes/Entities/Structures/cargo_console.yml
@@ -32,9 +32,14 @@
  - type: Damageable
    damageContainer: Inorganic
    damageModifierSet: Metallic
-  - type: SignalReceiver
-    inputs:
-      OrderReceiver: []
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: BasicDevice
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: DeviceLinkSink
+    ports:
+      - OrderReceiver
  - type: Destructible
    thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/conveyor.yml
+++ b/Resources/Prototypes/Entities/Structures/conveyor.yml
@@ -35,11 +35,11 @@
        - LowImpassable
        hard: False
  - type: Conveyor
-  - type: SignalReceiver
-    inputs:
-      Reverse: []
-      Forward: []
-      Off: []
+  - type: DeviceLinkSink
+    ports:
+      - Reverse
+      - Forward
+      - Off
  - type: Appearance
  - type: GenericVisualizer
    visuals: