Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Make manual valves work (#6121)

Browse Source 
* Make manual valves work

* Change some GasValveSystem lookups
This commit is contained in:
wrexbe
2022-01-15 05:18:45 -08:00
committed by GitHub
parent a3c1d8f22a
commit 94207a42e9
7 changed files with 102 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/Atmos/Piping/Binary/Components/GasValveComponent.cs
View File

@@ -1,4 +1,3 @@
using Content.Shared.Interaction;
using Content.Shared.Sound;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes;
@@ -15,11 +14,13 @@ namespace Content.Server.Atmos.Piping.Binary.Components
[DataField("open")]
public bool Open { get; set; } = true;
[DataField("pipe")]
[ViewVariables(VVAccess.ReadWrite)]
public string PipeName { get; } = "pipe";
[DataField("inlet")]
public string InletName { get; set; } = "inlet";
[DataField("outlet")]
public string OutletName { get; set; } = "outlet";
[DataField("valveSound")]
public SoundSpecifier _valveSound { get; } = new SoundCollectionSpecifier("valveSqueak");
public SoundSpecifier ValveSound { get; } = new SoundCollectionSpecifier("valveSqueak");
}
}

29
Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs
View File

@@ -20,6 +20,8 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
[UsedImplicitly]
public class GasValveSystem : EntitySystem
{
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
public override void Initialize()
{
base.Initialize();
@@ -31,7 +33,7 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
private void OnExamined(EntityUid uid, GasValveComponent valve, ExaminedEvent args)
{
if (!EntityManager.GetComponent<TransformComponent>(valve.Owner).Anchored || !args.IsInDetailsRange) // Not anchored? Out of range? No status.
if (!Comp<TransformComponent>(valve.Owner).Anchored || !args.IsInDetailsRange) // Not anchored? Out of range? No status.
return;
if (Loc.TryGetString("gas-valve-system-examined", out var str,
@@ -49,21 +51,34 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
private void OnActivate(EntityUid uid, GasValveComponent component, ActivateInWorldEvent args)
{
if (args.User.InRangeUnobstructed(args.Target) && Get<ActionBlockerSystem>().CanInteract(args.User))
if (args.User.InRangeUnobstructed(args.Target) && _actionBlockerSystem.CanInteract(args.User))
{
Toggle(uid, component);
SoundSystem.Play(Filter.Pvs(component.Owner), component._valveSound.GetSound(), component.Owner, AudioHelpers.WithVariation(0.25f));
SoundSystem.Play(Filter.Pvs(component.Owner), component.ValveSound.GetSound(), component.Owner, AudioHelpers.WithVariation(0.25f));
}
}
public void Set(EntityUid uid, GasValveComponent component, bool value)
{
component.Open = value;
if (EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)
&& nodeContainer.TryGetNode(component.PipeName, out PipeNode? pipe))
if (TryComp(uid, out NodeContainerComponent? nodeContainer)
&& nodeContainer.TryGetNode(component.InletName, out PipeNode? inlet)
&& nodeContainer.TryGetNode(component.OutletName, out PipeNode? outlet))
{
pipe.ConnectionsEnabled = component.Open;
if (TryComp<AppearanceComponent>(component.Owner,out var appearance))
{
appearance.SetData(FilterVisuals.Enabled, component.Open);
}
if (component.Open)
{
inlet.AddAlwaysReachable(outlet);
outlet.AddAlwaysReachable(inlet);
}
else
{
inlet.RemoveAlwaysReachable(outlet);
outlet.RemoveAlwaysReachable(inlet);
}
}
}

38
Content.Server/NodeContainer/Nodes/PipeNode.cs
View File

@@ -35,6 +35,26 @@ namespace Content.Server.NodeContainer.Nodes
/// </summary>
public PipeDirection CurrentPipeDirection { get; private set; }
private HashSet<PipeNode>? _alwaysReachable;
public void AddAlwaysReachable(PipeNode pipeNode)
{
if (NodeGroup == null) return;
if (pipeNode.NodeGroupID != NodeGroupID) return;
_alwaysReachable ??= new();
_alwaysReachable.Add(pipeNode);
EntitySystem.Get<NodeGroupSystem>().QueueRemakeGroup((BaseNodeGroup) NodeGroup);
}
public void RemoveAlwaysReachable(PipeNode pipeNode)
{
if (_alwaysReachable == null) return;
if (NodeGroup == null) return;
if (pipeNode.NodeGroupID != NodeGroupID) return;
_alwaysReachable.Remove(pipeNode);
EntitySystem.Get<NodeGroupSystem>().QueueRemakeGroup((BaseNodeGroup) NodeGroup);
}
/// <summary>
/// The directions in which this node is connected to other nodes.
/// Used by <see cref="PipeVisualState"/>.
@@ -144,6 +164,24 @@ namespace Content.Server.NodeContainer.Nodes
yield return pipe;
}
}
if(_alwaysReachable != null)
{
var remQ = new RemQueue<PipeNode>();
foreach(var pipe in _alwaysReachable)
{
if (pipe.Deleting)
{
remQ.Add(pipe);
}
yield return pipe;
}
foreach(var pipe in remQ)
{
_alwaysReachable.Remove(pipe);
}
}
}
/// <summary>