Rejig Device networks (#7380)

2022-04-09 00:27:10 +12:00
parent 44649e7fed
commit a4d55235cc
33 changed files with 671 additions and 247 deletions
--- a/Resources/Locale/en-US/devices/device-network.ftl
+++ b/Resources/Locale/en-US/devices/device-network.ftl
@@ -0,0 +1,8 @@
+# named frequencies
+device-frequency-prototype-name-atmos = Atmospheric Devices
+device-frequency-prototype-name-suit-sensors = Suit Sensors
+device-frequency-prototype-name-lights = Smart Lights
+
+# prefixes for randomly generated device addresses
+device-address-prefix-vent = Vnt-
+device-address-prefix-scrubber = Scr-
--- a/Resources/Prototypes/Device/devicenet_frequencies.yml
+++ b/Resources/Prototypes/Device/devicenet_frequencies.yml
@@ -0,0 +1,16 @@
+- type: deviceFrequency
+  id: AtmosMonitor
+  name: device-frequency-prototype-name-atmos
+  frequency: 1621
+
+# Only listen to this frequency if you are a health or GPS monitor. Otherwise you will just slow down the server by constantly receiving periodic broadcasts from every player-entity.
+- type: deviceFrequency
+  id: SuitSensor
+  name: device-frequency-prototype-name-suit-sensors
+  frequency: 1262
+
+# This frequency will likely have a LARGE number of listening entities. Please don't broadcast on this frequency.
+- type: deviceFrequency
+  id: SmartLight #used by powered lights.
+  name: device-frequency-prototype-name-lights
+  frequency: 1173
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
@@ -4,8 +4,9 @@
  id: ClothingWithSuitSensor
  components:
  - type: SuitSensor
-  - type: DeviceNetworkComponent
+  - type: DeviceNetwork
    deviceNetId: Wireless
+    transmitFrequencyId: SuitSensor
  - type: WirelessNetworkConnection
    range: 500

--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -176,7 +176,8 @@
      - AtmosphericsNitrogen
      - AtmosphericsCarbonDioxide
  - type: CrewMonitoringConsole
-  - type: DeviceNetworkComponent
+  - type: DeviceNetwork
    deviceNetId: Wireless
+    receiveFrequencyId: SuitSensor
  - type: WirelessNetworkConnection
    range: 500
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
@@ -14,7 +14,8 @@
      - key: enum.CrewMonitoringUIKey.Key
        type: CrewMonitoringBoundUserInterface
  - type: CrewMonitoringConsole
-  - type: DeviceNetworkComponent
+  - type: DeviceNetwork
    deviceNetId: Wireless
+    receiveFrequencyId: SuitSensor
  - type: WirelessNetworkConnection
    range: 500
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -10,9 +10,9 @@
      - AirAlarm
    - type: ApcPowerReceiver
    - type: ExtensionCableReceiver
-    - type: DeviceNetworkComponent
+    - type: DeviceNetwork
      deviceNetId: Apc
-      frequency: 1621
+      receiveFrequencyId: AtmosMonitor
    - type: ApcNetworkConnection
    - type: InteractionOutline
    - type: Damageable
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -137,8 +137,9 @@
        - key: enum.CrewMonitoringUIKey.Key
          type: CrewMonitoringBoundUserInterface
    - type: CrewMonitoringConsole
-    - type: DeviceNetworkComponent
+    - type: DeviceNetwork
      deviceNetId: Wireless
+      receiveFrequencyId: SuitSensor
    - type: WirelessNetworkConnection
      range: 500

--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -26,9 +26,11 @@
  components:
    - type: ApcPowerReceiver
    - type: ExtensionCableReceiver
-    - type: DeviceNetworkComponent
+    - type: DeviceNetwork
      deviceNetId: Apc
-      frequency: 1621
+      receiveFrequencyId: AtmosMonitor
+      transmitFrequencyId: AtmosMonitor
+      prefix: device-address-prefix-vent
    - type: ApcNetworkConnection
    - type: AtmosAlarmable
      alarmedBy:
@@ -96,9 +98,11 @@
  components:
    - type: ApcPowerReceiver
    - type: ExtensionCableReceiver
-    - type: DeviceNetworkComponent
+    - type: DeviceNetwork
      deviceNetId: Apc
-      frequency: 1621
+      receiveFrequencyId: AtmosMonitor
+      transmitFrequencyId: AtmosMonitor
+      prefix: device-address-prefix-scrubber
    - type: ApcNetworkConnection
    - type: AtmosAlarmable
      alarmedBy:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
@@ -6,9 +6,10 @@
  - type: WallMount
  - type: ApcPowerReceiver
  - type: ExtensionCableReceiver
-  - type: DeviceNetworkComponent
+  - type: DeviceNetwork
    deviceNetId: Apc
-    frequency: 1621
+    receiveFrequencyId: AtmosMonitor
+    transmitFrequencyId: AtmosMonitor
  - type: ApcNetworkConnection
  - type: AtmosMonitor
    temperatureThreshold: stationTemperature
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
@@ -6,9 +6,10 @@
  - type: WallMount
  - type: ApcPowerReceiver
  - type: ExtensionCableReceiver
-  - type: DeviceNetworkComponent
+  - type: DeviceNetwork
    deviceNetId: Apc
-    frequency: 1621
+    receiveFrequencyId: AtmosMonitor
+    transmitFrequencyId: AtmosMonitor
  - type: ApcNetworkConnection
  - type: AtmosMonitor
    monitorFire: true
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml
@@ -79,8 +79,9 @@
        Heat: 5
  - type: ApcPowerReceiver
  - type: ExtensionCableReceiver
-  - type: DeviceNetworkComponent
+  - type: DeviceNetwork
    deviceNetId: Apc
+    receiveFrequencyId: SmartLight
  - type: ApcNetworkConnection
  - type: Appearance
    visuals:
@@ -245,8 +246,9 @@
        Heat: 5
  - type: ApcPowerReceiver
  - type: ExtensionCableReceiver
-  - type: DeviceNetworkComponent
+  - type: DeviceNetwork
    deviceNetId: Apc
+    receiveFrequencyId: SmartLight
  - type: ApcNetworkConnection
  - type: Appearance
    visuals:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
@@ -58,8 +58,9 @@
      graph: LightSwitch
      node: lightSwitch
    - type: ExtensionCableReceiver
-    - type: DeviceNetworkComponent
+    - type: DeviceNetwork
      deviceNetId: Apc
+      transmitFrequencyId: SmartLight # assuming people want to use it for light switches.
    - type: ApcNetworkConnection
    - type: ApcNetSwitch
  placement:
--- a/Resources/Prototypes/Entities/Structures/lighting_ground.yml
+++ b/Resources/Prototypes/Entities/Structures/lighting_ground.yml
@@ -77,8 +77,9 @@
        Heat: 20
  - type: ApcPowerReceiver
  - type: ExtensionCableReceiver
-  - type: DeviceNetworkComponent
+  - type: DeviceNetwork
    deviceNetId: Apc
+    receiveFrequencyId: SmartLight
  - type: ApcNetworkConnection
  - type: Construction
    graph: LightFixture