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

Inline UID

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:53:09 +01:00
parent 2654775bf0
commit 5cd42c9ad6
803 changed files with 3613 additions and 3577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Content.Server/MachineLinking/System/SignalLinkerSystem.cs
View File

@@ -72,7 +72,7 @@ namespace Content.Server.MachineLinking.System
{
if (!IsInRange(component, link.ReceiverComponent)) continue;
RaiseLocalEvent(link.ReceiverComponent.Owner.Uid,
RaiseLocalEvent(link.ReceiverComponent.Owner,
new SignalReceivedEvent(link.Receiverport.Name, args.Value), false);
}
}
@@ -81,8 +81,8 @@ namespace Content.Server.MachineLinking.System
{
if (args.Handled) return;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<SignalLinkerComponent?>(args.Used.Uid, out var linker) || !linker.Port.HasValue ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User.Uid, out ActorComponent? actor) ||
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<SignalLinkerComponent?>(args.Used, out var linker) || !linker.Port.HasValue ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User, out ActorComponent? actor) ||
!linker.Port.Value.transmitter.Outputs.TryGetPort(linker.Port.Value.port, out var port))
{
return;
@@ -121,9 +121,9 @@ namespace Content.Server.MachineLinking.System
{
case SignalPortSelected portSelected:
if (msg.Session.AttachedEntity == null ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(msg.Session.AttachedEntity.Uid, out HandsComponent? hands) ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(msg.Session.AttachedEntity, out HandsComponent? hands) ||
!hands.TryGetActiveHeldEntity(out var heldEntity) ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(heldEntity.Uid, out SignalLinkerComponent? signalLinkerComponent) ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(heldEntity, out SignalLinkerComponent? signalLinkerComponent) ||
!_interaction.InRangeUnobstructed(msg.Session.AttachedEntity, component.Owner, ignoreInsideBlocker: true) ||
!signalLinkerComponent.Port.HasValue ||
!signalLinkerComponent.Port.Value.transmitter.Outputs.ContainsPort(signalLinkerComponent.Port
@@ -161,9 +161,9 @@ namespace Content.Server.MachineLinking.System
{
case SignalPortSelected portSelected:
if (msg.Session.AttachedEntity == null ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(msg.Session.AttachedEntity.Uid, out HandsComponent? hands) ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(msg.Session.AttachedEntity, out HandsComponent? hands) ||
!hands.TryGetActiveHeldEntity(out var heldEntity) ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(heldEntity.Uid, out SignalLinkerComponent? signalLinkerComponent) ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(heldEntity, out SignalLinkerComponent? signalLinkerComponent) ||
!_interaction.InRangeUnobstructed(msg.Session.AttachedEntity, component.Owner, ignoreInsideBlocker: true))
return;
LinkerSaveInteraction(msg.Session.AttachedEntity, signalLinkerComponent, component,
@@ -177,8 +177,8 @@ namespace Content.Server.MachineLinking.System
{
if (args.Handled) return;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<SignalLinkerComponent?>(args.Used.Uid, out var linker) ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User.Uid, out ActorComponent? actor))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<SignalLinkerComponent?>(args.Used, out var linker) ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(args.User, out ActorComponent? actor))
{
return;
}
@@ -205,8 +205,8 @@ namespace Content.Server.MachineLinking.System
{
if (_linkCollection.RemoveLink(transmitter, transmitterPort, receiver, receiverPort))
{
RaiseLocalEvent(receiver.Owner.Uid, new PortDisconnectedEvent(receiverPort));
RaiseLocalEvent(transmitter.Owner.Uid, new PortDisconnectedEvent(transmitterPort));
RaiseLocalEvent(receiver.Owner, new PortDisconnectedEvent(receiverPort));
RaiseLocalEvent(transmitter.Owner, new PortDisconnectedEvent(transmitterPort));
entity.PopupMessageCursor(Loc.GetString("signal-linker-component-unlinked-port",
("port", receiverPort), ("machine", receiver)));
}
@@ -241,14 +241,14 @@ namespace Content.Server.MachineLinking.System
}
var linkAttempt = new LinkAttemptEvent(entity, transmitter, transmitterPort, receiver, receiverPort);
RaiseLocalEvent(receiver.Owner.Uid, linkAttempt);
RaiseLocalEvent(transmitter.Owner.Uid, linkAttempt);
RaiseLocalEvent(receiver.Owner, linkAttempt);
RaiseLocalEvent(transmitter.Owner, linkAttempt);
if (linkAttempt.Cancelled) return;
var link = _linkCollection.AddLink(transmitter, transmitterPort, receiver, receiverPort);
if (link.Transmitterport.Signal != null)
RaiseLocalEvent(receiver.Owner.Uid,
RaiseLocalEvent(receiver.Owner,
new SignalReceivedEvent(receiverPort, link.Transmitterport.Signal));
entity.PopupMessageCursor(Loc.GetString("signal-linker-component-linked-port", ("port", receiverPort),
@@ -277,15 +277,15 @@ namespace Content.Server.MachineLinking.System
private bool IsInRange(SignalTransmitterComponent transmitterComponent,
SignalReceiverComponent receiverComponent)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<ApcPowerReceiverComponent?>(transmitterComponent.Owner.Uid, out var transmitterPowerReceiverComponent) &&
IoCManager.Resolve<IEntityManager>().TryGetComponent<ApcPowerReceiverComponent?>(receiverComponent.Owner.Uid, out var receiverPowerReceiverComponent)
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<ApcPowerReceiverComponent?>(transmitterComponent.Owner, out var transmitterPowerReceiverComponent) &&
IoCManager.Resolve<IEntityManager>().TryGetComponent<ApcPowerReceiverComponent?>(receiverComponent.Owner, out var receiverPowerReceiverComponent)
) //&& todo are they on the same powernet?
{
return true;
}
return IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(transmitterComponent.Owner.Uid).MapPosition.InRange(
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(receiverComponent.Owner.Uid).MapPosition, 30f);
return IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(transmitterComponent.Owner).MapPosition.InRange(
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(receiverComponent.Owner).MapPosition, 30f);
}
}
}