tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apc device network and apc based light switch (#4908)

Browse Source 
* Remove WireNet node group from cables
Implement extension cable components and system
Remove connection over distance logic from ApcPower... components

* Add extension cable components to prototypes

* Implement ApcNetwork
Implement ApcNetSwitch

* Fix ignoredComponents.cs

* Add friend attribute to new components

* Add construction graph for a light switch

* Address reviews

* Fix broken test

* Move ConnectionType enum to DeviceNetworkComponent
Change netId data definition to use the ConnectionType enum values

Co-authored-by: Julian Giebel <j.giebel@netrocks.info>
This commit is contained in:
Julian Giebel
2021-10-24 01:23:19 +02:00
committed by GitHub
parent e7f352d6c2
commit 45caf25ea9
43 changed files with 678 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
View File

@@ -17,7 +17,7 @@ namespace Content.Server.DeviceNetwork.Systems
{
[Dependency] private readonly IRobustRandom _random = default!;
private readonly Dictionary<int, List<DeviceNetworkComponent>> _connections = new();
private readonly Dictionary<DeviceNetworkComponent.ConnectionType, List<DeviceNetworkComponent>> _connections = new();
private readonly Queue<NetworkPacket> _packets = new();
public override void Initialize()
@@ -139,7 +139,7 @@ namespace Content.Server.DeviceNetwork.Systems
/// <summary>
/// Generates a valid address by randomly generating one and checking if it already exists on the device network with the given device netId.
/// </summary>
private string GenerateValidAddress(int netId)
private string GenerateValidAddress(DeviceNetworkComponent.ConnectionType netId)
{
var unique = false;
var connections = _connections[netId];
@@ -154,7 +154,7 @@ namespace Content.Server.DeviceNetwork.Systems
return address;
}
private List<DeviceNetworkComponent> ConnectionsForFrequency(int netId, int frequency)
private List<DeviceNetworkComponent> ConnectionsForFrequency(DeviceNetworkComponent.ConnectionType netId, int frequency)
{
if (!_connections.ContainsKey(netId))
return new List<DeviceNetworkComponent>();
@@ -164,7 +164,7 @@ namespace Content.Server.DeviceNetwork.Systems
return result;
}
private bool TryGetConnectionWithAddress(int netId, int frequency, string address, [NotNullWhen(true)] out DeviceNetworkComponent connection)
private bool TryGetConnectionWithAddress(DeviceNetworkComponent.ConnectionType netId, int frequency, string address, [NotNullWhen(true)] out DeviceNetworkComponent connection)
{
var connections = ConnectionsForFrequency(netId, frequency);
@@ -180,7 +180,7 @@ namespace Content.Server.DeviceNetwork.Systems
return false;
}
private List<DeviceNetworkComponent> ConnectionsWithReceiveAll(int netId, int frequency)
private List<DeviceNetworkComponent> ConnectionsWithReceiveAll(DeviceNetworkComponent.ConnectionType netId, int frequency)
{
if (!_connections.ContainsKey(netId))
return new List<DeviceNetworkComponent>();
@@ -195,7 +195,7 @@ namespace Content.Server.DeviceNetwork.Systems
if (!TryGetConnectionWithAddress(packet.NetId, packet.Frequency, packet.Address, out var connection))
return;
var receivers = ConnectionsWithReceiveAll(packet.Frequency, packet.NetId);
var receivers = ConnectionsWithReceiveAll(packet.NetId, packet.Frequency);
receivers.Add(connection);
SendToConnections(receivers, packet);
@@ -203,7 +203,7 @@ namespace Content.Server.DeviceNetwork.Systems
private void BroadcastPacket(NetworkPacket packet)
{
var receivers = ConnectionsForFrequency(packet.Frequency, packet.NetId);
var receivers = ConnectionsForFrequency(packet.NetId, packet.Frequency);
SendToConnections(receivers, packet);
}
@@ -223,7 +223,7 @@ namespace Content.Server.DeviceNetwork.Systems
internal struct NetworkPacket
{
public int NetId;
public DeviceNetworkComponent.ConnectionType NetId;
public int Frequency;
public string Address;
public bool Broadcast;