Atmos pipe rework (#3833)
* Initial * Cleanup a bunch of things * some changes dunno * RequireAnchored * a * stuff * more work * Lots of progress * delete pipe visualizer * a * b * pipenet and pipenode cleanup * Fixes * Adds GasValve * Adds GasMiner * Fix stuff, maybe? * More fixes * Ignored components on the client * Adds thermomachine behavior, change a bunch of stuff * Remove Anchored * some work, but it's shitcode * significantly more ECS * ECS AtmosDevices * Cleanup * fix appearance * when the pipe direction is sus * Gas tanks and canisters * pipe anchoring and stuff * coding is my passion * Unsafe pipes take longer to unanchor * turns out we're no longer using eris canisters * Gas canister inserted tank appearance, improvements * Work on a bunch of appearances * Scrubber appearance * Reorganize AtmosphereSystem.Piping into a bunch of different systems * Appearance for vent/scrubber/pump turns off when leaving atmosphere * ThermoMachine appearance * Cleanup gas tanks * Remove passive gate unused imports * remove old canister UI functionality * PipeNode environment air, make everything use AssumeAir instead of merging manually * a * Reorganize atmos to follow new structure * ????? * Canister UI, restructure client * Restructure shared * Fix build tho * listen, at least the canister UI works entirely... * fix build : ) * Atmos device prototypes have names and descriptions * gas canister ui slider doesn't jitter * trinary prototypes * sprite for miners * ignore components * fix YAML * Fix port system doing useless thing * Fix build * fix thinking moment * fix build again because * canister direction * pipenode is a word * GasTank Air will throw on invalid states * fix build.... * Unhardcode volume pump thresholds * Volume pump and filter take time into account * Rename Join/Leave atmosphere events to AtmosDeviceEnabled/Disabled Event * Gas tank node volume is set by initial mixtuer * I love node container
This commit is contained in:
committed by
GitHub
parent
cfc3f2e7fc
commit
a2b737d945
@@ -1,15 +1,19 @@
|
||||
#nullable enable
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Content.Server.Atmos;
|
||||
using Content.Server.GameObjects.EntitySystems;
|
||||
using Content.Server.Atmos.Components;
|
||||
using Content.Server.Atmos.EntitySystems;
|
||||
using Content.Server.GameObjects.Components.NodeContainer.Nodes;
|
||||
using Content.Server.Interfaces;
|
||||
using Content.Server.NodeContainer.Nodes;
|
||||
using Content.Shared.Atmos;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.ViewVariables;
|
||||
|
||||
namespace Content.Server.NodeContainer.NodeGroups
|
||||
{
|
||||
public interface IPipeNet : IGasMixtureHolder
|
||||
public interface IPipeNet : INodeGroup, IGasMixtureHolder
|
||||
{
|
||||
/// <summary>
|
||||
/// Causes gas in the PipeNet to react.
|
||||
@@ -21,7 +25,7 @@ namespace Content.Server.NodeContainer.NodeGroups
|
||||
public class PipeNet : BaseNodeGroup, IPipeNet
|
||||
{
|
||||
[ViewVariables]
|
||||
public GasMixture Air { get; set; } = new();
|
||||
public GasMixture Air { get; set; } = new() {Temperature = Atmospherics.T20C};
|
||||
|
||||
public static readonly IPipeNet NullNet = new NullPipeNet();
|
||||
|
||||
@@ -49,11 +53,10 @@ namespace Content.Server.NodeContainer.NodeGroups
|
||||
{
|
||||
if (node is not PipeNode pipeNode)
|
||||
return;
|
||||
|
||||
_pipes.Add(pipeNode);
|
||||
pipeNode.JoinPipeNet(this);
|
||||
Air.Volume += pipeNode.Volume;
|
||||
Air.Merge(pipeNode.LocalAir);
|
||||
pipeNode.LocalAir.Clear();
|
||||
}
|
||||
|
||||
protected override void OnRemoveNode(Node node)
|
||||
@@ -61,9 +64,8 @@ namespace Content.Server.NodeContainer.NodeGroups
|
||||
RemoveFromGridAtmos();
|
||||
if (node is not PipeNode pipeNode)
|
||||
return;
|
||||
var pipeAir = pipeNode.LocalAir;
|
||||
pipeAir.Merge(Air);
|
||||
pipeAir.Multiply(pipeNode.Volume / Air.Volume);
|
||||
|
||||
pipeNode.ClearPipeNet();
|
||||
_pipes.Remove(pipeNode);
|
||||
}
|
||||
|
||||
@@ -71,21 +73,28 @@ namespace Content.Server.NodeContainer.NodeGroups
|
||||
{
|
||||
if (newGroup is not IPipeNet newPipeNet)
|
||||
return;
|
||||
|
||||
newPipeNet.Air.Merge(Air);
|
||||
Air.Clear();
|
||||
}
|
||||
|
||||
protected override void AfterRemake(IEnumerable<INodeGroup> newGroups)
|
||||
{
|
||||
RemoveFromGridAtmos();
|
||||
|
||||
var buffer = new GasMixture(Air.Volume) {Temperature = Air.Temperature};
|
||||
|
||||
foreach (var newGroup in newGroups)
|
||||
{
|
||||
if (newGroup is not IPipeNet newPipeNet)
|
||||
continue;
|
||||
newPipeNet.Air.Merge(Air);
|
||||
var newPipeNetGas = newPipeNet.Air;
|
||||
newPipeNetGas.Multiply(newPipeNetGas.Volume / Air.Volume);
|
||||
|
||||
var newAir = newPipeNet.Air;
|
||||
|
||||
buffer.Clear();
|
||||
buffer.Merge(Air);
|
||||
buffer.Multiply(MathF.Min(newAir.Volume / Air.Volume, 1f));
|
||||
newAir.Merge(buffer);
|
||||
}
|
||||
RemoveFromGridAtmos();
|
||||
}
|
||||
|
||||
private void RemoveFromGridAtmos()
|
||||
@@ -93,9 +102,18 @@ namespace Content.Server.NodeContainer.NodeGroups
|
||||
GridAtmos?.RemovePipeNet(this);
|
||||
}
|
||||
|
||||
private class NullPipeNet : IPipeNet
|
||||
private class NullPipeNet : NullNodeGroup, IPipeNet
|
||||
{
|
||||
GasMixture IGasMixtureHolder.Air { get; set; } = new();
|
||||
private readonly GasMixture _air;
|
||||
|
||||
GasMixture IGasMixtureHolder.Air { get => _air; set { } }
|
||||
|
||||
public NullPipeNet()
|
||||
{
|
||||
_air = new GasMixture(1f) {Temperature = Atmospherics.T20C};
|
||||
_air.MarkImmutable();
|
||||
}
|
||||
|
||||
public void Update() { }
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user