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

ECS Atmos Part 2: Moves a lot of Gas Mixture methods to AtmosphereSystem. (#4218)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-06-23 11:35:30 +02:00
committed by GitHub
parent e16c23a747
commit 263c9ef974
34 changed files with 461 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.IntegrationTests/Tests/Atmos/GasMixtureTest.cs
View File

@@ -1,7 +1,9 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using Content.Server.Atmos; using Content.Server.Atmos;
using Content.Server.Atmos.EntitySystems;
using Content.Shared.Atmos; using Content.Shared.Atmos;
using NUnit.Framework; using NUnit.Framework;
using Robust.Shared.GameObjects;
namespace Content.IntegrationTests.Tests.Atmos namespace Content.IntegrationTests.Tests.Atmos
{ {
@@ -14,6 +16,10 @@ namespace Content.IntegrationTests.Tests.Atmos
{ {
var server = StartServerDummyTicker(); var server = StartServerDummyTicker();
await server.WaitIdleAsync();
var atmosphereSystem = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<AtmosphereSystem>();
server.Assert(() => server.Assert(() =>
{ {
var a = new GasMixture(10f); var a = new GasMixture(10f);
@@ -30,7 +36,7 @@ namespace Content.IntegrationTests.Tests.Atmos
Assert.That(b.TotalMoles, Is.EqualTo(50)); Assert.That(b.TotalMoles, Is.EqualTo(50));
Assert.That(b.GetMoles(Gas.Nitrogen), Is.EqualTo(50)); Assert.That(b.GetMoles(Gas.Nitrogen), Is.EqualTo(50));
b.Merge(a); atmosphereSystem.Merge(b, a);
// b now has its contents and the contents of a // b now has its contents and the contents of a
Assert.That(b.TotalMoles, Is.EqualTo(100)); Assert.That(b.TotalMoles, Is.EqualTo(100));

2
Content.IntegrationTests/Tests/Body/LungTest.cs
View File

@@ -105,7 +105,7 @@ namespace Content.IntegrationTests.Tests.Body
var exhaledOxygen = Math.Abs(lungOxygenBeforeExhale - lungOxygenAfterExhale); var exhaledOxygen = Math.Abs(lungOxygenBeforeExhale - lungOxygenAfterExhale);
// Not completely empty // Not completely empty
Assert.Positive(lung.Air.Gases.Sum()); Assert.Positive(lung.Air.Moles.Sum());
// Retains needed gas // Retains needed gas
Assert.Positive(bloodstream.Air.GetMoles(Gas.Oxygen)); Assert.Positive(bloodstream.Air.GetMoles(Gas.Oxygen));

6
Content.Server/Atmos/Components/AtmosExposedComponent.cs
View File

@@ -1,4 +1,5 @@
#nullable enable #nullable enable
using Content.Server.Atmos.EntitySystems;
using Content.Server.Temperature.Components; using Content.Server.Temperature.Components;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
@@ -23,14 +24,15 @@ namespace Content.Server.Atmos.Components
[ViewVariables] [ViewVariables]
[ComponentDependency] private readonly FlammableComponent? _flammableComponent = null; [ComponentDependency] private readonly FlammableComponent? _flammableComponent = null;
public void Update(TileAtmosphere tile, float frameDelta) public void Update(TileAtmosphere tile, float frameDelta, AtmosphereSystem atmosphereSystem)
{ {
if (_temperatureComponent != null) if (_temperatureComponent != null)
{ {
if (tile.Air != null) if (tile.Air != null)
{ {
var temperatureDelta = tile.Air.Temperature - _temperatureComponent.CurrentTemperature; var temperatureDelta = tile.Air.Temperature - _temperatureComponent.CurrentTemperature;
var heat = temperatureDelta * (tile.Air.HeatCapacity * _temperatureComponent.HeatCapacity / (tile.Air.HeatCapacity + _temperatureComponent.HeatCapacity)); var tileHeatCapacity = atmosphereSystem.GetHeatCapacity(tile.Air);
var heat = temperatureDelta * (tileHeatCapacity * _temperatureComponent.HeatCapacity / (tileHeatCapacity + _temperatureComponent.HeatCapacity));
_temperatureComponent.ReceiveHeat(heat); _temperatureComponent.ReceiveHeat(heat);
} }
_temperatureComponent.Update(); _temperatureComponent.Update();

4
Content.Server/Atmos/Components/GasAnalyzerComponent.cs
View File

@@ -204,9 +204,9 @@ namespace Content.Server.Atmos.Components
{ {
var gas = atmosSystem.GetGas(i); var gas = atmosSystem.GetGas(i);
if (tile.Gases[i] <= Atmospherics.GasMinMoles) continue; if (tile.Moles[i] <= Atmospherics.GasMinMoles) continue;
gases.Add(new GasEntry(gas.Name, tile.Gases[i], gas.Color)); gases.Add(new GasEntry(gas.Name, tile.Moles[i], gas.Color));
} }
UserInterface.SetState( UserInterface.SetState(

18
Content.Server/Atmos/Components/GasTankComponent.cs
View File

@@ -1,6 +1,7 @@
#nullable enable #nullable enable
#nullable disable warnings #nullable disable warnings
using System; using System;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Body.Respiratory; using Content.Server.Body.Respiratory;
using Content.Server.Explosion; using Content.Server.Explosion;
using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.GameObjects.Components.NodeContainer.Nodes;
@@ -155,13 +156,6 @@ namespace Content.Server.Atmos.Components
DisconnectFromInternals(); DisconnectFromInternals();
} }
public void Update()
{
Air?.React(this);
CheckStatus();
UpdateUserInterface();
}
public GasMixture? RemoveAir(float amount) public GasMixture? RemoveAir(float amount)
{ {
var gas = Air?.Remove(amount); var gas = Air?.Remove(amount);
@@ -223,7 +217,7 @@ namespace Content.Server.Atmos.Components
UpdateUserInterface(); UpdateUserInterface();
} }
private void UpdateUserInterface(bool initialUpdate = false) public void UpdateUserInterface(bool initialUpdate = false)
{ {
var internals = GetInternalsComponent(); var internals = GetInternalsComponent();
_userInterface?.SetState( _userInterface?.SetState(
@@ -279,15 +273,17 @@ namespace Content.Server.Atmos.Components
public void AssumeAir(GasMixture giver) public void AssumeAir(GasMixture giver)
{ {
Air?.Merge(giver); EntitySystem.Get<AtmosphereSystem>().Merge(Air, giver);
CheckStatus(); CheckStatus();
} }
private void CheckStatus() public void CheckStatus()
{ {
if (Air == null) if (Air == null)
return; return;
var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
var pressure = Air.Pressure; var pressure = Air.Pressure;
if (pressure > TankFragmentPressure) if (pressure > TankFragmentPressure)
@@ -295,7 +291,7 @@ namespace Content.Server.Atmos.Components
// Give the gas a chance to build up more pressure. // Give the gas a chance to build up more pressure.
for (var i = 0; i < 3; i++) for (var i = 0; i < 3; i++)
{ {
Air.React(this); atmosphereSystem.React(Air, this);
} }
pressure = Air.Pressure; pressure = Air.Pressure;

17
Content.Server/Atmos/Components/GridAtmosphereComponent.cs
View File

@@ -7,6 +7,7 @@ using System.Linq;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using Content.Server.Atmos.EntitySystems; using Content.Server.Atmos.EntitySystems;
using Content.Server.Atmos.Piping.Components; using Content.Server.Atmos.Piping.Components;
using Content.Server.CPUJob.JobQueues.Queues;
using Content.Server.NodeContainer.NodeGroups; using Content.Server.NodeContainer.NodeGroups;
using Content.Shared.Atmos; using Content.Shared.Atmos;
using Content.Shared.Maps; using Content.Shared.Maps;
@@ -204,7 +205,7 @@ namespace Content.Server.Atmos.Components
foreach (var tile in mapGrid.Grid.GetAllTiles()) foreach (var tile in mapGrid.Grid.GetAllTiles())
{ {
if(!Tiles.ContainsKey(tile.GridIndices)) if(!Tiles.ContainsKey(tile.GridIndices))
Tiles.Add(tile.GridIndices, new TileAtmosphere(this, tile.GridIndex, tile.GridIndices, new GasMixture(GetVolumeForCells(1), AtmosphereSystem){Temperature = Atmospherics.T20C})); Tiles.Add(tile.GridIndices, new TileAtmosphere(this, tile.GridIndex, tile.GridIndices, new GasMixture(GetVolumeForCells(1)){Temperature = Atmospherics.T20C}));
Invalidate(tile.GridIndices); Invalidate(tile.GridIndices);
} }
@@ -230,7 +231,7 @@ namespace Content.Server.Atmos.Components
if (tile == null) if (tile == null)
{ {
tile = new TileAtmosphere(this, _gridId, indices, new GasMixture(GetVolumeForCells(1), AtmosphereSystem){Temperature = Atmospherics.T20C}); tile = new TileAtmosphere(this, _gridId, indices, new GasMixture(GetVolumeForCells(1)){Temperature = Atmospherics.T20C});
Tiles[indices] = tile; Tiles[indices] = tile;
} }
@@ -238,7 +239,7 @@ namespace Content.Server.Atmos.Components
if (IsSpace(indices) && !isAirBlocked) if (IsSpace(indices) && !isAirBlocked)
{ {
tile.Air = new GasMixture(GetVolumeForCells(1), AtmosphereSystem); tile.Air = new GasMixture(GetVolumeForCells(1));
tile.Air.MarkImmutable(); tile.Air.MarkImmutable();
Tiles[indices] = tile; Tiles[indices] = tile;
@@ -271,7 +272,7 @@ namespace Content.Server.Atmos.Components
tile.Air = null; tile.Air = null;
} }
tile.Air ??= new GasMixture(GetVolumeForCells(1), AtmosphereSystem){Temperature = Atmospherics.T20C}; tile.Air ??= new GasMixture(GetVolumeForCells(1)){Temperature = Atmospherics.T20C};
} }
// By removing the active tile, we effectively remove its excited group, if any. // By removing the active tile, we effectively remove its excited group, if any.
@@ -312,7 +313,7 @@ namespace Content.Server.Atmos.Components
if (tile?.GridIndex != _gridId) return; if (tile?.GridIndex != _gridId) return;
// includeAirBlocked is false, therefore all tiles in this have Air != null. // includeAirBlocked is false, therefore all tiles in this have Air != null.
var adjacent = GetAdjacentTiles(indices); var adjacent = GetAdjacentTiles(indices);
tile.Air = new GasMixture(GetVolumeForCells(1), AtmosphereSystem){Temperature = Atmospherics.T20C}; tile.Air = new GasMixture(GetVolumeForCells(1)){Temperature = Atmospherics.T20C};
Tiles[indices] = tile; Tiles[indices] = tile;
var ratio = 1f / adjacent.Count; var ratio = 1f / adjacent.Count;
@@ -320,8 +321,8 @@ namespace Content.Server.Atmos.Components
foreach (var (_, adj) in adjacent) foreach (var (_, adj) in adjacent)
{ {
var mix = adj.Air!.RemoveRatio(ratio); var mix = adj.Air!.RemoveRatio(ratio);
tile.Air.Merge(mix); AtmosphereSystem.Merge(tile.Air, mix);
adj.Air.Merge(mix); AtmosphereSystem.Merge(adj.Air, mix);
} }
} }
@@ -435,7 +436,7 @@ namespace Content.Server.Atmos.Components
// We don't have that tile! // We don't have that tile!
if (IsSpace(indices) && createSpace) if (IsSpace(indices) && createSpace)
{ {
return new TileAtmosphere(this, _gridId, indices, new GasMixture(GetVolumeForCells(1), AtmosphereSystem){Temperature = Atmospherics.TCMB}, true); return new TileAtmosphere(this, _gridId, indices, new GasMixture(GetVolumeForCells(1)){Temperature = Atmospherics.TCMB}, true);
} }
return null; return null;

3
Content.Server/Atmos/Components/SpaceGridAtmosphereComponent.cs
View File

@@ -1,6 +1,7 @@
#nullable enable #nullable enable
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Content.Shared.Atmos;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Maths; using Robust.Shared.Maths;
@@ -22,7 +23,7 @@ namespace Content.Server.Atmos.Components
public override TileAtmosphere GetTile(Vector2i indices, bool createSpace = true) public override TileAtmosphere GetTile(Vector2i indices, bool createSpace = true)
{ {
return new(this, GridId.Invalid, indices, new GasMixture(2500, AtmosphereSystem), true); return new(this, GridId.Invalid, indices, new GasMixture(Atmospherics.CellVolume), true);
} }
protected override IEnumerable<AirtightComponent> GetObstructingComponents(Vector2i indices) protected override IEnumerable<AirtightComponent> GetObstructingComponents(Vector2i indices)

269
Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
View File

@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Content.Server.Atmos.Reactions; using Content.Server.Atmos.Reactions;
using Content.Server.Interfaces;
using Content.Shared.Atmos; using Content.Shared.Atmos;
using Robust.Shared.Maths; using Robust.Shared.Maths;
@@ -30,5 +31,273 @@ namespace Content.Server.Atmos.EntitySystems
_gasSpecificHeats[i] = GasPrototypes[i].SpecificHeat; _gasSpecificHeats[i] = GasPrototypes[i].SpecificHeat;
} }
} }
public float GetHeatCapacity(GasMixture mixture)
{
Span<float> tmp = stackalloc float[mixture.Moles.Length];
NumericsHelpers.Multiply(mixture.Moles, GasSpecificHeats, tmp);
return MathF.Max(NumericsHelpers.HorizontalAdd(tmp), Atmospherics.MinimumHeatCapacity);
}
public float GetHeatCapacityArchived(GasMixture mixture)
{
Span<float> tmp = stackalloc float[mixture.Moles.Length];
NumericsHelpers.Multiply(mixture.MolesArchived, GasSpecificHeats, tmp);
return MathF.Max(NumericsHelpers.HorizontalAdd(tmp), Atmospherics.MinimumHeatCapacity);
}
public float GetThermalEnergy(GasMixture mixture)
{
return mixture.Temperature * GetHeatCapacity(mixture);
}
public void Merge(GasMixture receiver, GasMixture giver)
{
if (receiver.Immutable) return;
if (MathF.Abs(receiver.Temperature - giver.Temperature) > Atmospherics.MinimumTemperatureDeltaToConsider)
{
var combinedHeatCapacity = GetHeatCapacity(receiver) + GetHeatCapacity(giver);
if (combinedHeatCapacity > 0f)
{
receiver.Temperature = (GetThermalEnergy(giver) + GetThermalEnergy(receiver)) / combinedHeatCapacity;
}
}
NumericsHelpers.Add(receiver.Moles, giver.Moles);
}
public float Share(GasMixture receiver, GasMixture sharer, int atmosAdjacentTurfs)
{
var temperatureDelta = receiver.TemperatureArchived - sharer.TemperatureArchived;
var absTemperatureDelta = Math.Abs(temperatureDelta);
var oldHeatCapacity = 0f;
var oldSharerHeatCapacity = 0f;
if (absTemperatureDelta > Atmospherics.MinimumTemperatureDeltaToConsider)
{
oldHeatCapacity = GetHeatCapacity(receiver);
oldSharerHeatCapacity = GetHeatCapacity(sharer);
}
var heatCapacityToSharer = 0f;
var heatCapacitySharerToThis = 0f;
var movedMoles = 0f;
var absMovedMoles = 0f;
for(var i = 0; i < Atmospherics.TotalNumberOfGases; i++)
{
var thisValue = receiver.Moles[i];
var sharerValue = sharer.Moles[i];
var delta = (thisValue - sharerValue) / (atmosAdjacentTurfs + 1);
if (!(MathF.Abs(delta) >= Atmospherics.GasMinMoles)) continue;
if (absTemperatureDelta > Atmospherics.MinimumTemperatureDeltaToConsider)
{
var gasHeatCapacity = delta * GasSpecificHeats[i];
if (delta > 0)
{
heatCapacityToSharer += gasHeatCapacity;
}
else
{
heatCapacitySharerToThis -= gasHeatCapacity;
}
}
if (!receiver.Immutable) receiver.Moles[i] -= delta;
if (!sharer.Immutable) sharer.Moles[i] += delta;
movedMoles += delta;
absMovedMoles += MathF.Abs(delta);
}
receiver.LastShare = absMovedMoles;
if (absTemperatureDelta > Atmospherics.MinimumTemperatureDeltaToConsider)
{
var newHeatCapacity = oldHeatCapacity + heatCapacitySharerToThis - heatCapacityToSharer;
var newSharerHeatCapacity = oldSharerHeatCapacity + heatCapacityToSharer - heatCapacitySharerToThis;
// Transfer of thermal energy (via changed heat capacity) between self and sharer.
if (!receiver.Immutable && newHeatCapacity > Atmospherics.MinimumHeatCapacity)
{
receiver.Temperature = ((oldHeatCapacity * receiver.Temperature) - (heatCapacityToSharer * receiver.TemperatureArchived) + (heatCapacitySharerToThis * sharer.TemperatureArchived)) / newHeatCapacity;
}
if (!sharer.Immutable && newSharerHeatCapacity > Atmospherics.MinimumHeatCapacity)
{
sharer.Temperature = ((oldSharerHeatCapacity * sharer.Temperature) - (heatCapacitySharerToThis * sharer.TemperatureArchived) + (heatCapacityToSharer*receiver.TemperatureArchived)) / newSharerHeatCapacity;
}
// Thermal energy of the system (self and sharer) is unchanged.
if (MathF.Abs(oldSharerHeatCapacity) > Atmospherics.MinimumHeatCapacity)
{
if (MathF.Abs(newSharerHeatCapacity / oldSharerHeatCapacity - 1) < 0.1)
{
TemperatureShare(receiver, sharer, Atmospherics.OpenHeatTransferCoefficient);
}
}
}
if (!(temperatureDelta > Atmospherics.MinimumTemperatureToMove) &&
!(MathF.Abs(movedMoles) > Atmospherics.MinimumMolesDeltaToMove)) return 0f;
var moles = receiver.TotalMoles;
var theirMoles = sharer.TotalMoles;
return (receiver.TemperatureArchived * (moles + movedMoles)) - (sharer.TemperatureArchived * (theirMoles - movedMoles)) * Atmospherics.R / receiver.Volume;
}
public float TemperatureShare(GasMixture receiver, GasMixture sharer, float conductionCoefficient)
{
var temperatureDelta = receiver.TemperatureArchived - sharer.TemperatureArchived;
if (MathF.Abs(temperatureDelta) > Atmospherics.MinimumTemperatureDeltaToConsider)
{
var heatCapacity = GetHeatCapacityArchived(receiver);
var sharerHeatCapacity = GetHeatCapacityArchived(sharer);
if (sharerHeatCapacity > Atmospherics.MinimumHeatCapacity && heatCapacity > Atmospherics.MinimumHeatCapacity)
{
var heat = conductionCoefficient * temperatureDelta * (heatCapacity * sharerHeatCapacity / (heatCapacity + sharerHeatCapacity));
if (!receiver.Immutable)
receiver.Temperature = MathF.Abs(MathF.Max(receiver.Temperature - heat / heatCapacity, Atmospherics.TCMB));
if (!sharer.Immutable)
sharer.Temperature = MathF.Abs(MathF.Max(sharer.Temperature + heat / sharerHeatCapacity, Atmospherics.TCMB));
}
}
return sharer.Temperature;
}
public float TemperatureShare(GasMixture receiver, float conductionCoefficient, float sharerTemperature, float sharerHeatCapacity)
{
var temperatureDelta = receiver.TemperatureArchived - sharerTemperature;
if (MathF.Abs(temperatureDelta) > Atmospherics.MinimumTemperatureDeltaToConsider)
{
var heatCapacity = GetHeatCapacityArchived(receiver);
if (sharerHeatCapacity > Atmospherics.MinimumHeatCapacity && heatCapacity > Atmospherics.MinimumHeatCapacity)
{
var heat = conductionCoefficient * temperatureDelta * (heatCapacity * sharerHeatCapacity / (heatCapacity + sharerHeatCapacity));
if (!receiver.Immutable)
receiver.Temperature = MathF.Abs(MathF.Max(receiver.Temperature - heat / heatCapacity, Atmospherics.TCMB));
sharerTemperature = MathF.Abs(MathF.Max(sharerTemperature + heat / sharerHeatCapacity, Atmospherics.TCMB));
}
}
return sharerTemperature;
}
/// <summary>
/// Releases gas from this mixture to the output mixture.
/// If the output mixture is null, then this is being released into space.
/// It can't transfer air to a mixture with higher pressure.
/// </summary>
public bool ReleaseGasTo(GasMixture mixture, GasMixture? output, float targetPressure)
{
var outputStartingPressure = output?.Pressure ?? 0;
var inputStartingPressure = mixture.Pressure;
if (outputStartingPressure >= MathF.Min(targetPressure, inputStartingPressure - 10))
// No need to pump gas if the target is already reached or input pressure is too low.
// Need at least 10 kPa difference to overcome friction in the mechanism.
return false;
if (!(mixture.TotalMoles > 0) || !(mixture.Temperature > 0)) return false;
// We calculate the necessary moles to transfer with the ideal gas law.
var pressureDelta = MathF.Min(targetPressure - outputStartingPressure, (inputStartingPressure - outputStartingPressure) / 2f);
var transferMoles = pressureDelta * (output?.Volume ?? Atmospherics.CellVolume) / (mixture.Temperature * Atmospherics.R);
// And now we transfer the gas.
var removed = mixture.Remove(transferMoles);
if(output != null)
Merge(output, removed);
return true;
}
/// <summary>
/// Pump gas from this mixture to the output mixture.
/// Amount depends on target pressure.
/// </summary>
/// <param name="mixture">The mixture to pump the gas from</param>
/// <param name="output">The mixture to pump the gas to</param>
/// <param name="targetPressure">The target pressure to reach</param>
/// <returns>Whether we could pump air to the output or not</returns>
public bool PumpGasTo(GasMixture mixture, GasMixture output, float targetPressure)
{
var outputStartingPressure = output.Pressure;
var pressureDelta = targetPressure - outputStartingPressure;
if (pressureDelta < 0.01)
// No need to pump gas, we've reached the target.
return false;
if (!(mixture.TotalMoles > 0) || !(mixture.Temperature > 0)) return false;
// We calculate the necessary moles to transfer with the ideal gas law.
var transferMoles = pressureDelta * output.Volume / (mixture.Temperature * Atmospherics.R);
// And now we transfer the gas.
var removed = mixture.Remove(transferMoles);
Merge(output, removed);
return true;
}
public void ScrubInto(GasMixture mixture, GasMixture destination, IReadOnlyCollection<Gas> filterGases)
{
var buffer = new GasMixture(mixture.Volume){Temperature = mixture.Temperature};
foreach (var gas in filterGases)
{
buffer.AdjustMoles(gas, mixture.GetMoles(gas));
mixture.SetMoles(gas, 0f);
}
Merge(destination, buffer);
}
public ReactionResult React(GasMixture mixture, IGasMixtureHolder holder)
{
var reaction = ReactionResult.NoReaction;
var temperature = mixture.Temperature;
var energy = GetThermalEnergy(mixture);
foreach (var prototype in GasReactions)
{
if (energy < prototype.MinimumEnergyRequirement ||
temperature < prototype.MinimumTemperatureRequirement ||
temperature > prototype.MaximumTemperatureRequirement)
continue;
var doReaction = true;
for (var i = 0; i < prototype.MinimumRequirements.Length; i++)
{
if(i > Atmospherics.TotalNumberOfGases)
throw new IndexOutOfRangeException("Reaction Gas Minimum Requirements Array Prototype exceeds total number of gases!");
var req = prototype.MinimumRequirements[i];
if (!(mixture.GetMoles(i) < req)) continue;
doReaction = false;
break;
}
if (!doReaction)
continue;
reaction = prototype.React(mixture, holder, this);
if(reaction.HasFlag(ReactionResult.StopReactions))
break;
}
return reaction;
}
} }
} }

8
Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
View File

@@ -33,7 +33,7 @@ namespace Content.Server.Atmos.EntitySystems
var number = 0; var number = 0;
while (atmosphere.CurrentRunTiles.TryDequeue(out var tile)) while (atmosphere.CurrentRunTiles.TryDequeue(out var tile))
{ {
tile.EqualizePressureInZone(atmosphere.UpdateCounter); tile.EqualizePressureInZone(this, atmosphere.UpdateCounter);
if (number++ < LagCheckIterations) continue; if (number++ < LagCheckIterations) continue;
number = 0; number = 0;
@@ -55,7 +55,7 @@ namespace Content.Server.Atmos.EntitySystems
var number = 0; var number = 0;
while (atmosphere.CurrentRunTiles.TryDequeue(out var tile)) while (atmosphere.CurrentRunTiles.TryDequeue(out var tile))
{ {
tile.ProcessCell(atmosphere.UpdateCounter, SpaceWind); tile.ProcessCell(this, atmosphere.UpdateCounter, SpaceWind);
if (number++ < LagCheckIterations) continue; if (number++ < LagCheckIterations) continue;
number = 0; number = 0;
@@ -81,7 +81,7 @@ namespace Content.Server.Atmos.EntitySystems
excitedGroup.DismantleCooldown++; excitedGroup.DismantleCooldown++;
if(excitedGroup.BreakdownCooldown > Atmospherics.ExcitedGroupBreakdownCycles) if(excitedGroup.BreakdownCooldown > Atmospherics.ExcitedGroupBreakdownCycles)
excitedGroup.SelfBreakdown(ExcitedGroupsSpaceIsAllConsuming); excitedGroup.SelfBreakdown(this, ExcitedGroupsSpaceIsAllConsuming);
else if(excitedGroup.DismantleCooldown > Atmospherics.ExcitedGroupsDismantleCycles) else if(excitedGroup.DismantleCooldown > Atmospherics.ExcitedGroupsDismantleCycles)
excitedGroup.Dismantle(); excitedGroup.Dismantle();
@@ -153,7 +153,7 @@ namespace Content.Server.Atmos.EntitySystems
var number = 0; var number = 0;
while (atmosphere.CurrentRunTiles.TryDequeue(out var superconductivity)) while (atmosphere.CurrentRunTiles.TryDequeue(out var superconductivity))
{ {
superconductivity.Superconduct(); superconductivity.Superconduct(this);
if (number++ < LagCheckIterations) continue; if (number++ < LagCheckIterations) continue;
number = 0; number = 0;

2
Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
View File

@@ -159,7 +159,7 @@ namespace Content.Server.Atmos.EntitySystems
{ {
var tile = exposed.Owner.Transform.Coordinates.GetTileAtmosphere(); var tile = exposed.Owner.Transform.Coordinates.GetTileAtmosphere();
if (tile == null) continue; if (tile == null) continue;
exposed.Update(tile, _exposedTimer); exposed.Update(tile, _exposedTimer, this);
} }
_exposedTimer -= ExposedUpdateDelay; _exposedTimer -= ExposedUpdateDelay;

28
Content.Server/Atmos/EntitySystems/GasTankSystem.cs
View File

@@ -1,28 +0,0 @@
using Content.Server.Atmos.Components;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
namespace Content.Server.Atmos.EntitySystems
{
[UsedImplicitly]
public class GasTankSystem : EntitySystem
{
private float _timer = 0f;
private const float Interval = 0.5f;
public override void Update(float frameTime)
{
base.Update(frameTime);
_timer += frameTime;
if (_timer < Interval) return;
_timer = 0f;
foreach (var gasTank in EntityManager.ComponentManager.EntityQuery<GasTankComponent>(true))
{
gasTank.Update();
}
}
}
}

2
Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
View File

@@ -167,7 +167,7 @@ namespace Content.Server.Atmos.EntitySystems
var overlay = _atmosphereSystem.GetOverlay(i); var overlay = _atmosphereSystem.GetOverlay(i);
if (overlay == null) continue; if (overlay == null) continue;
var moles = tile.Air.Gases[i]; var moles = tile.Air.Moles[i];
if (moles < gas.GasMolesVisible) continue; if (moles < gas.GasMolesVisible) continue;

5
Content.Server/Atmos/ExcitedGroup.cs
View File

@@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Content.Server.Atmos.Components; using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Shared.Atmos; using Content.Shared.Atmos;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
@@ -82,7 +83,7 @@ namespace Content.Server.Atmos
DismantleCooldown = 0; DismantleCooldown = 0;
} }
public void SelfBreakdown(bool spaceIsAllConsuming = false) public void SelfBreakdown(AtmosphereSystem atmosphereSystem, bool spaceIsAllConsuming = false)
{ {
var combined = new GasMixture(Atmospherics.CellVolume); var combined = new GasMixture(Atmospherics.CellVolume);
@@ -99,7 +100,7 @@ namespace Content.Server.Atmos
foreach (var tile in _tiles) foreach (var tile in _tiles)
{ {
if (tile?.Air == null) continue; if (tile?.Air == null) continue;
combined.Merge(tile.Air); atmosphereSystem.Merge(combined, tile.Air);
if (!spaceIsAllConsuming || !tile.Air.Immutable) continue; if (!spaceIsAllConsuming || !tile.Air.Immutable) continue;
combined.Clear(); combined.Clear();
break; break;

372
Content.Server/Atmos/GasMixture.cs
View File

@@ -22,26 +22,23 @@ namespace Content.Server.Atmos
[DataDefinition] [DataDefinition]
public class GasMixture : IEquatable<GasMixture>, ICloneable, ISerializationHooks public class GasMixture : IEquatable<GasMixture>, ICloneable, ISerializationHooks
{ {
private AtmosphereSystem? _atmosphereSystem; public static GasMixture SpaceGas => new() {Volume = Atmospherics.CellVolume, Temperature = Atmospherics.TCMB, Immutable = true};
public static GasMixture SpaceGas => new() {Volume = 2500f, Immutable = true, Temperature = Atmospherics.TCMB};
// This must always have a length that is a multiple of 4 for SIMD acceleration. // This must always have a length that is a multiple of 4 for SIMD acceleration.
[DataField("moles")] [ViewVariables] private float[] _moles = new float[Atmospherics.AdjustedNumberOfGases]; [DataField("moles")] [ViewVariables]
public float[] Moles = new float[Atmospherics.AdjustedNumberOfGases];
[DataField("molesArchived")] [ViewVariables] [DataField("molesArchived")] [ViewVariables]
private float[] _molesArchived = new float[Atmospherics.AdjustedNumberOfGases]; public float[] MolesArchived = new float[Atmospherics.AdjustedNumberOfGases];
[DataField("temperature")] [ViewVariables] [DataField("temperature")] [ViewVariables]
private float _temperature = Atmospherics.TCMB; private float _temperature = Atmospherics.TCMB;
public IReadOnlyList<float> Gases => _moles;
[DataField("immutable")] [ViewVariables] [DataField("immutable")] [ViewVariables]
public bool Immutable { get; private set; } public bool Immutable { get; private set; }
[DataField("lastShare")] [ViewVariables] [DataField("lastShare")] [ViewVariables]
public float LastShare { get; private set; } public float LastShare { get; set; }
[ViewVariables] [ViewVariables]
public readonly Dictionary<GasReaction, float> ReactionResults = new() public readonly Dictionary<GasReaction, float> ReactionResults = new()
@@ -50,39 +47,11 @@ namespace Content.Server.Atmos
{ GasReaction.Fire, 0f } { GasReaction.Fire, 0f }
}; };
[ViewVariables]
public float HeatCapacity
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get
{
_atmosphereSystem ??= EntitySystem.Get<AtmosphereSystem>();
Span<float> tmp = stackalloc float[_moles.Length];
NumericsHelpers.Multiply(_moles, _atmosphereSystem.GasSpecificHeats, tmp);
return MathF.Max(NumericsHelpers.HorizontalAdd(tmp), Atmospherics.MinimumHeatCapacity);
}
}
[ViewVariables]
public float HeatCapacityArchived
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get
{
_atmosphereSystem ??= EntitySystem.Get<AtmosphereSystem>();
Span<float> tmp = stackalloc float[_moles.Length];
NumericsHelpers.Multiply(_molesArchived, _atmosphereSystem.GasSpecificHeats, tmp);
return MathF.Max(NumericsHelpers.HorizontalAdd(tmp), Atmospherics.MinimumHeatCapacity);
}
}
[ViewVariables] [ViewVariables]
public float TotalMoles public float TotalMoles
{ {
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
get => NumericsHelpers.HorizontalAdd(_moles); get => NumericsHelpers.HorizontalAdd(Moles);
} }
[ViewVariables] [ViewVariables]
@@ -106,25 +75,17 @@ namespace Content.Server.Atmos
} }
} }
[ViewVariables]
public float ThermalEnergy => Temperature * HeatCapacity;
[DataField("temperatureArchived")] [ViewVariables] [DataField("temperatureArchived")] [ViewVariables]
public float TemperatureArchived { get; private set; } public float TemperatureArchived { get; private set; }
[DataField("volume")] [ViewVariables] [DataField("volume")] [ViewVariables]
public float Volume { get; set; } public float Volume { get; set; }
public GasMixture() : this(null) public GasMixture()
{ {
} }
public GasMixture(AtmosphereSystem? atmosphereSystem) public GasMixture(float volume = 0f)
{
_atmosphereSystem = atmosphereSystem;
}
public GasMixture(float volume, AtmosphereSystem? atmosphereSystem = null): this(atmosphereSystem)
{ {
if (volume < 0) if (volume < 0)
volume = 0; volume = 0;
@@ -140,31 +101,14 @@ namespace Content.Server.Atmos
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Archive() public void Archive()
{ {
_moles.AsSpan().CopyTo(_molesArchived.AsSpan()); Moles.AsSpan().CopyTo(MolesArchived.AsSpan());
TemperatureArchived = Temperature; TemperatureArchived = Temperature;
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Merge(GasMixture giver)
{
if (Immutable) return;
if (MathF.Abs(Temperature - giver.Temperature) > Atmospherics.MinimumTemperatureDeltaToConsider)
{
var combinedHeatCapacity = HeatCapacity + giver.HeatCapacity;
if (combinedHeatCapacity > 0f)
{
Temperature = (giver.Temperature * giver.HeatCapacity + Temperature * HeatCapacity) / combinedHeatCapacity;
}
}
NumericsHelpers.Add(_moles, giver._moles);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public float GetMoles(int gasId) public float GetMoles(int gasId)
{ {
return _moles[gasId]; return Moles[gasId];
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -180,7 +124,7 @@ namespace Content.Server.Atmos
throw new ArgumentException($"Invalid quantity \"{quantity}\" specified!", nameof(quantity)); throw new ArgumentException($"Invalid quantity \"{quantity}\" specified!", nameof(quantity));
if (!Immutable) if (!Immutable)
_moles[gasId] = quantity; Moles[gasId] = quantity;
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -197,9 +141,9 @@ namespace Content.Server.Atmos
if (float.IsInfinity(quantity) || float.IsNaN(quantity)) if (float.IsInfinity(quantity) || float.IsNaN(quantity))
throw new ArgumentException($"Invalid quantity \"{quantity}\" specified!", nameof(quantity)); throw new ArgumentException($"Invalid quantity \"{quantity}\" specified!", nameof(quantity));
_moles[gasId] += quantity; Moles[gasId] += quantity;
var moles = _moles[gasId]; var moles = Moles[gasId];
if (float.IsInfinity(moles) || float.IsNaN(moles) || float.IsNegative(moles)) if (float.IsInfinity(moles) || float.IsNaN(moles) || float.IsNegative(moles))
throw new Exception($"Invalid mole quantity \"{moles}\" in gas Id {gasId} after adjusting moles with \"{quantity}\"!"); throw new Exception($"Invalid mole quantity \"{moles}\" in gas Id {gasId} after adjusting moles with \"{quantity}\"!");
@@ -224,28 +168,28 @@ namespace Content.Server.Atmos
switch (ratio) switch (ratio)
{ {
case <= 0: case <= 0:
return new GasMixture(Volume, _atmosphereSystem){Temperature = Temperature}; return new GasMixture(Volume){Temperature = Temperature};
case > 1: case > 1:
ratio = 1; ratio = 1;
break; break;
} }
var removed = new GasMixture(_atmosphereSystem) {Volume = Volume, Temperature = Temperature}; var removed = new GasMixture(Volume) { Temperature = Temperature };
_moles.CopyTo(removed._moles.AsSpan()); Moles.CopyTo(removed.Moles.AsSpan());
NumericsHelpers.Multiply(removed._moles, ratio); NumericsHelpers.Multiply(removed.Moles, ratio);
if (!Immutable) if (!Immutable)
NumericsHelpers.Sub(_moles, removed._moles); NumericsHelpers.Sub(Moles, removed.Moles);
for (var i = 0; i < _moles.Length; i++) for (var i = 0; i < Moles.Length; i++)
{ {
var moles = _moles[i]; var moles = Moles[i];
var otherMoles = removed._moles[i]; var otherMoles = removed.Moles[i];
if (moles < Atmospherics.GasMinMoles || float.IsNaN(moles)) if (moles < Atmospherics.GasMinMoles || float.IsNaN(moles))
_moles[i] = 0; Moles[i] = 0;
if (otherMoles < Atmospherics.GasMinMoles || float.IsNaN(otherMoles)) if (otherMoles < Atmospherics.GasMinMoles || float.IsNaN(otherMoles))
removed._moles[i] = 0; removed.Moles[i] = 0;
} }
return removed; return removed;
@@ -255,139 +199,10 @@ namespace Content.Server.Atmos
public void CopyFromMutable(GasMixture sample) public void CopyFromMutable(GasMixture sample)
{ {
if (Immutable) return; if (Immutable) return;
sample._moles.CopyTo(_moles, 0); sample.Moles.CopyTo(Moles, 0);
Temperature = sample.Temperature; Temperature = sample.Temperature;
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public float Share(GasMixture sharer, int atmosAdjacentTurfs)
{
_atmosphereSystem ??= EntitySystem.Get<AtmosphereSystem>();
var temperatureDelta = TemperatureArchived - sharer.TemperatureArchived;
var absTemperatureDelta = Math.Abs(temperatureDelta);
var oldHeatCapacity = 0f;
var oldSharerHeatCapacity = 0f;
if (absTemperatureDelta > Atmospherics.MinimumTemperatureDeltaToConsider)
{
oldHeatCapacity = HeatCapacity;
oldSharerHeatCapacity = sharer.HeatCapacity;
}
var heatCapacityToSharer = 0f;
var heatCapacitySharerToThis = 0f;
var movedMoles = 0f;
var absMovedMoles = 0f;
for(var i = 0; i < Atmospherics.TotalNumberOfGases; i++)
{
var thisValue = _moles[i];
var sharerValue = sharer._moles[i];
var delta = (thisValue - sharerValue) / (atmosAdjacentTurfs + 1);
if (!(MathF.Abs(delta) >= Atmospherics.GasMinMoles)) continue;
if (absTemperatureDelta > Atmospherics.MinimumTemperatureDeltaToConsider)
{
var gasHeatCapacity = delta * _atmosphereSystem.GasSpecificHeats[i];
if (delta > 0)
{
heatCapacityToSharer += gasHeatCapacity;
}
else
{
heatCapacitySharerToThis -= gasHeatCapacity;
}
}
if (!Immutable) _moles[i] -= delta;
if (!sharer.Immutable) sharer._moles[i] += delta;
movedMoles += delta;
absMovedMoles += MathF.Abs(delta);
}
LastShare = absMovedMoles;
if (absTemperatureDelta > Atmospherics.MinimumTemperatureDeltaToConsider)
{
var newHeatCapacity = oldHeatCapacity + heatCapacitySharerToThis - heatCapacityToSharer;
var newSharerHeatCapacity = oldSharerHeatCapacity + heatCapacityToSharer - heatCapacitySharerToThis;
// Transfer of thermal energy (via changed heat capacity) between self and sharer.
if (!Immutable && newHeatCapacity > Atmospherics.MinimumHeatCapacity)
{
Temperature = ((oldHeatCapacity * Temperature) - (heatCapacityToSharer * TemperatureArchived) + (heatCapacitySharerToThis * sharer.TemperatureArchived)) / newHeatCapacity;
}
if (!sharer.Immutable && newSharerHeatCapacity > Atmospherics.MinimumHeatCapacity)
{
sharer.Temperature = ((oldSharerHeatCapacity * sharer.Temperature) - (heatCapacitySharerToThis * sharer.TemperatureArchived) + (heatCapacityToSharer*TemperatureArchived)) / newSharerHeatCapacity;
}
// Thermal energy of the system (self and sharer) is unchanged.
if (MathF.Abs(oldSharerHeatCapacity) > Atmospherics.MinimumHeatCapacity)
{
if (MathF.Abs(newSharerHeatCapacity / oldSharerHeatCapacity - 1) < 0.1)
{
TemperatureShare(sharer, Atmospherics.OpenHeatTransferCoefficient);
}
}
}
if (!(temperatureDelta > Atmospherics.MinimumTemperatureToMove) &&
!(MathF.Abs(movedMoles) > Atmospherics.MinimumMolesDeltaToMove)) return 0f;
var moles = TotalMoles;
var theirMoles = sharer.TotalMoles;
return (TemperatureArchived * (moles + movedMoles)) - (sharer.TemperatureArchived * (theirMoles - movedMoles)) * Atmospherics.R / Volume;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public float TemperatureShare(GasMixture sharer, float conductionCoefficient)
{
var temperatureDelta = TemperatureArchived - sharer.TemperatureArchived;
if (MathF.Abs(temperatureDelta) > Atmospherics.MinimumTemperatureDeltaToConsider)
{
var heatCapacity = HeatCapacityArchived;
var sharerHeatCapacity = sharer.HeatCapacityArchived;
if (sharerHeatCapacity > Atmospherics.MinimumHeatCapacity && heatCapacity > Atmospherics.MinimumHeatCapacity)
{
var heat = conductionCoefficient * temperatureDelta * (heatCapacity * sharerHeatCapacity / (heatCapacity + sharerHeatCapacity));
if (!Immutable)
Temperature = MathF.Abs(MathF.Max(Temperature - heat / heatCapacity, Atmospherics.TCMB));
if (!sharer.Immutable)
sharer.Temperature = MathF.Abs(MathF.Max(sharer.Temperature + heat / sharerHeatCapacity, Atmospherics.TCMB));
}
}
return sharer.Temperature;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public float TemperatureShare(float conductionCoefficient, float sharerTemperature, float sharerHeatCapacity)
{
var temperatureDelta = TemperatureArchived - sharerTemperature;
if (MathF.Abs(temperatureDelta) > Atmospherics.MinimumTemperatureDeltaToConsider)
{
var heatCapacity = HeatCapacityArchived;
if (sharerHeatCapacity > Atmospherics.MinimumHeatCapacity && heatCapacity > Atmospherics.MinimumHeatCapacity)
{
var heat = conductionCoefficient * temperatureDelta * (heatCapacity * sharerHeatCapacity / (heatCapacity + sharerHeatCapacity));
if (!Immutable)
Temperature = MathF.Abs(MathF.Max(Temperature - heat / heatCapacity, Atmospherics.TCMB));
sharerTemperature = MathF.Abs(MathF.Max(sharerTemperature + heat / sharerHeatCapacity, Atmospherics.TCMB));
}
}
return sharerTemperature;
}
public enum GasCompareResult public enum GasCompareResult
{ {
NoExchange = -2, NoExchange = -2,
@@ -404,8 +219,8 @@ namespace Content.Server.Atmos
for(var i = 0; i < Atmospherics.TotalNumberOfGases; i++) for(var i = 0; i < Atmospherics.TotalNumberOfGases; i++)
{ {
var gasMoles = _moles[i]; var gasMoles = Moles[i];
var delta = MathF.Abs(gasMoles - sample._moles[i]); var delta = MathF.Abs(gasMoles - sample.Moles[i]);
if (delta > Atmospherics.MinimumMolesDeltaToMove && (delta > gasMoles * Atmospherics.MinimumAirRatioToMove)) if (delta > Atmospherics.MinimumMolesDeltaToMove && (delta > gasMoles * Atmospherics.MinimumAirRatioToMove))
return (GasCompareResult)i; // We can move gases! return (GasCompareResult)i; // We can move gases!
moles += gasMoles; moles += gasMoles;
@@ -422,125 +237,25 @@ namespace Content.Server.Atmos
return GasCompareResult.NoExchange; return GasCompareResult.NoExchange;
} }
/// <summary>
/// Pump gas from this mixture to the output mixture.
/// Amount depends on target pressure.
/// </summary>
/// <param name="outputAir">The mixture to pump the gas to</param>
/// <param name="targetPressure">The target pressure to reach</param>
/// <returns>Whether we could pump air to the output or not</returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool PumpGasTo(GasMixture outputAir, float targetPressure)
{
var outputStartingPressure = outputAir.Pressure;
var pressureDelta = targetPressure - outputStartingPressure;
if (pressureDelta < 0.01)
// No need to pump gas, we've reached the target.
return false;
if (!(TotalMoles > 0) || !(Temperature > 0)) return false;
// We calculate the necessary moles to transfer with the ideal gas law.
var transferMoles = pressureDelta * outputAir.Volume / (Temperature * Atmospherics.R);
// And now we transfer the gas.
var removed = Remove(transferMoles);
outputAir.Merge(removed);
return true;
}
/// <summary>
/// Releases gas from this mixture to the output mixture.
/// If the output mixture is null, then this is being released into space.
/// It can't transfer air to a mixture with higher pressure.
/// </summary>
/// <param name="outputAir"></param>
/// <param name="targetPressure"></param>
/// <returns></returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool ReleaseGasTo(GasMixture? outputAir, float targetPressure)
{
var outputStartingPressure = outputAir?.Pressure ?? 0;
var inputStartingPressure = Pressure;
if (outputStartingPressure >= MathF.Min(targetPressure, inputStartingPressure - 10))
// No need to pump gas if the target is already reached or input pressure is too low.
// Need at least 10 kPa difference to overcome friction in the mechanism.
return false;
if (!(TotalMoles > 0) || !(Temperature > 0)) return false;
// We calculate the necessary moles to transfer with the ideal gas law.
var pressureDelta = MathF.Min(targetPressure - outputStartingPressure, (inputStartingPressure - outputStartingPressure) / 2f);
var transferMoles = pressureDelta * (outputAir?.Volume ?? Atmospherics.CellVolume) / (Temperature * Atmospherics.R);
// And now we transfer the gas.
var removed = Remove(transferMoles);
outputAir?.Merge(removed);
return true;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public ReactionResult React(IGasMixtureHolder holder)
{
_atmosphereSystem ??= EntitySystem.Get<AtmosphereSystem>();
var reaction = ReactionResult.NoReaction;
var temperature = Temperature;
var energy = ThermalEnergy;
foreach (var prototype in _atmosphereSystem.GasReactions)
{
if (energy < prototype.MinimumEnergyRequirement ||
temperature < prototype.MinimumTemperatureRequirement ||
temperature > prototype.MaximumTemperatureRequirement)
continue;
var doReaction = true;
for (var i = 0; i < prototype.MinimumRequirements.Length; i++)
{
if(i > Atmospherics.TotalNumberOfGases)
throw new IndexOutOfRangeException("Reaction Gas Minimum Requirements Array Prototype exceeds total number of gases!");
var req = prototype.MinimumRequirements[i];
if (!(GetMoles(i) < req)) continue;
doReaction = false;
break;
}
if (!doReaction)
continue;
reaction = prototype.React(this, holder, _atmosphereSystem.GridTileLookupSystem);
if(reaction.HasFlag(ReactionResult.StopReactions))
break;
}
return reaction;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Clear() public void Clear()
{ {
if (Immutable) return; if (Immutable) return;
Array.Clear(_moles, 0, Atmospherics.TotalNumberOfGases); Array.Clear(Moles, 0, Atmospherics.TotalNumberOfGases);
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Multiply(float multiplier) public void Multiply(float multiplier)
{ {
if (Immutable) return; if (Immutable) return;
NumericsHelpers.Multiply(_moles, multiplier); NumericsHelpers.Multiply(Moles, multiplier);
} }
void ISerializationHooks.AfterDeserialization() void ISerializationHooks.AfterDeserialization()
{ {
// The arrays MUST have a specific length. // The arrays MUST have a specific length.
Array.Resize(ref _moles, Atmospherics.AdjustedNumberOfGases); Array.Resize(ref Moles, Atmospherics.AdjustedNumberOfGases);
Array.Resize(ref _molesArchived, Atmospherics.AdjustedNumberOfGases); Array.Resize(ref MolesArchived, Atmospherics.AdjustedNumberOfGases);
} }
public override bool Equals(object? obj) public override bool Equals(object? obj)
@@ -554,8 +269,8 @@ namespace Content.Server.Atmos
{ {
if (ReferenceEquals(null, other)) return false; if (ReferenceEquals(null, other)) return false;
if (ReferenceEquals(this, other)) return true; if (ReferenceEquals(this, other)) return true;
return _moles.SequenceEqual(other._moles) return Moles.SequenceEqual(other.Moles)
&& _molesArchived.SequenceEqual(other._molesArchived) && MolesArchived.SequenceEqual(other.MolesArchived)
&& _temperature.Equals(other._temperature) && _temperature.Equals(other._temperature)
&& ReactionResults.SequenceEqual(other.ReactionResults) && ReactionResults.SequenceEqual(other.ReactionResults)
&& Immutable == other.Immutable && Immutable == other.Immutable
@@ -570,8 +285,8 @@ namespace Content.Server.Atmos
for (var i = 0; i < Atmospherics.TotalNumberOfGases; i++) for (var i = 0; i < Atmospherics.TotalNumberOfGases; i++)
{ {
var moles = _moles[i]; var moles = Moles[i];
var molesArchived = _molesArchived[i]; var molesArchived = MolesArchived[i];
hashCode.Add(moles); hashCode.Add(moles);
hashCode.Add(molesArchived); hashCode.Add(molesArchived);
} }
@@ -587,10 +302,10 @@ namespace Content.Server.Atmos
public object Clone() public object Clone()
{ {
var newMixture = new GasMixture(_atmosphereSystem) var newMixture = new GasMixture()
{ {
_moles = (float[])_moles.Clone(), Moles = (float[])Moles.Clone(),
_molesArchived = (float[])_molesArchived.Clone(), MolesArchived = (float[])MolesArchived.Clone(),
_temperature = _temperature, _temperature = _temperature,
Immutable = Immutable, Immutable = Immutable,
LastShare = LastShare, LastShare = LastShare,
@@ -599,18 +314,5 @@ namespace Content.Server.Atmos
}; };
return newMixture; return newMixture;
} }
public void ScrubInto(GasMixture destination, IReadOnlyCollection<Gas> filterGases)
{
var buffer = new GasMixture(Volume){Temperature = Temperature};
foreach (var gas in filterGases)
{
buffer.AdjustMoles(gas, GetMoles(gas));
SetMoles(gas, 0f);
}
destination.Merge(buffer);
}
} }
} }

3
Content.Server/Atmos/Piping/Binary/EntitySystems/GasCanisterSystem.cs
View File

@@ -1,5 +1,6 @@
using System; using System;
using Content.Server.Atmos.Components; using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Atmos.Piping.Binary.Components; using Content.Server.Atmos.Piping.Binary.Components;
using Content.Server.Atmos.Piping.Components; using Content.Server.Atmos.Piping.Components;
using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.GameObjects.Components.NodeContainer.Nodes;
@@ -49,7 +50,7 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
// Create a pipenet if we don't have one already. // Create a pipenet if we don't have one already.
portNode.TryAssignGroupIfNeeded(); portNode.TryAssignGroupIfNeeded();
portNode.Air.Merge(canister.InitialMixture); Get<AtmosphereSystem>().Merge(portNode.Air, canister.InitialMixture);
portNode.Air.Temperature = canister.InitialMixture.Temperature; portNode.Air.Temperature = canister.InitialMixture.Temperature;
portNode.Volume = canister.InitialMixture.Volume; portNode.Volume = canister.InitialMixture.Volume;
} }

5
Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs
View File

@@ -1,3 +1,4 @@
using Content.Server.Atmos.EntitySystems;
using Content.Server.Atmos.Piping.Components; using Content.Server.Atmos.Piping.Components;
using Content.Server.Construction.Components; using Content.Server.Construction.Components;
using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.GameObjects.Components.NodeContainer.Nodes;
@@ -67,11 +68,13 @@ namespace Content.Server.Atmos.Piping.EntitySystems
var sharedLoss = lost / timesLost; var sharedLoss = lost / timesLost;
var buffer = new GasMixture(); var buffer = new GasMixture();
var atmosphereSystem = Get<AtmosphereSystem>();
foreach (var node in nodes.Nodes.Values) foreach (var node in nodes.Nodes.Values)
{ {
if (node is not PipeNode pipe) continue; if (node is not PipeNode pipe) continue;
buffer.Merge(pipe.Air.Remove(sharedLoss)); atmosphereSystem.Merge(buffer, pipe.Air.Remove(sharedLoss));
} }
environment?.AssumeAir(buffer); environment?.AssumeAir(buffer);

23
Content.Server/Atmos/Piping/Unary/EntitySystems/GasTankSystem.cs
View File

@@ -1,4 +1,5 @@
using Content.Server.Atmos.Components; using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.GameObjects.Components.NodeContainer.Nodes;
using Content.Server.NodeContainer; using Content.Server.NodeContainer;
using JetBrains.Annotations; using JetBrains.Annotations;
@@ -9,6 +10,9 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
[UsedImplicitly] [UsedImplicitly]
public class GasTankSystem : EntitySystem public class GasTankSystem : EntitySystem
{ {
private const float TimerDelay = 0.5f;
private float _timer = 0f;
public override void Initialize() public override void Initialize()
{ {
base.Initialize(); base.Initialize();
@@ -31,5 +35,24 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
tankNode.Air.Volume = tank.InitialMixture.Volume; tankNode.Air.Volume = tank.InitialMixture.Volume;
tankNode.Air.Temperature = tank.InitialMixture.Temperature; tankNode.Air.Temperature = tank.InitialMixture.Temperature;
} }
public override void Update(float frameTime)
{
base.Update(frameTime);
_timer += frameTime;
if (_timer < TimerDelay) return;
_timer -= TimerDelay;
var atmosphereSystem = Get<AtmosphereSystem>();
foreach (var gasTank in EntityManager.ComponentManager.EntityQuery<GasTankComponent>(true))
{
atmosphereSystem.React(gasTank.Air, gasTank);
gasTank.CheckStatus();
gasTank.UpdateUserInterface();
}
}
} }
} }

3
Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
View File

@@ -1,3 +1,4 @@
using Content.Server.Atmos.EntitySystems;
using Content.Server.Atmos.Piping.Components; using Content.Server.Atmos.Piping.Components;
using Content.Server.Atmos.Piping.Unary.Components; using Content.Server.Atmos.Piping.Unary.Components;
using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.GameObjects.Components.NodeContainer.Nodes;
@@ -34,7 +35,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
if (!nodeContainer.TryGetNode(thermoMachine.InletName, out PipeNode? inlet)) if (!nodeContainer.TryGetNode(thermoMachine.InletName, out PipeNode? inlet))
return; return;
var airHeatCapacity = inlet.Air.HeatCapacity; var airHeatCapacity = Get<AtmosphereSystem>().GetHeatCapacity(inlet.Air);
var combinedHeatCapacity = airHeatCapacity + thermoMachine.HeatCapacity; var combinedHeatCapacity = airHeatCapacity + thermoMachine.HeatCapacity;
var oldTemperature = inlet.Air.Temperature; var oldTemperature = inlet.Air.Temperature;

4
Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
View File

@@ -1,4 +1,5 @@
using System; using System;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Atmos.Piping.Components; using Content.Server.Atmos.Piping.Components;
using Content.Server.Atmos.Piping.Unary.Components; using Content.Server.Atmos.Piping.Unary.Components;
using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.GameObjects.Components.NodeContainer.Nodes;
@@ -88,7 +89,8 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
if (MathHelper.CloseTo(removed.TotalMoles, 0f)) if (MathHelper.CloseTo(removed.TotalMoles, 0f))
return; return;
removed.ScrubInto(outlet.Air, scrubber.FilterGases); // TODO: Entity system dependency
Get<AtmosphereSystem>().ScrubInto(removed, outlet.Air, scrubber.FilterGases);
// Remix the gases. // Remix the gases.
tile.AssumeAir(removed); tile.AssumeAir(removed);

5
Content.Server/Atmos/Reactions/GasReactionPrototype.cs
View File

@@ -1,6 +1,7 @@
#nullable enable #nullable enable
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Interfaces; using Content.Server.Interfaces;
using Content.Shared.Atmos; using Content.Shared.Atmos;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
@@ -66,13 +67,13 @@ namespace Content.Server.Atmos.Reactions
/// </summary> /// </summary>
[DataField("effects")] private List<IGasReactionEffect> _effects = new(); [DataField("effects")] private List<IGasReactionEffect> _effects = new();
public ReactionResult React(GasMixture mixture, IGasMixtureHolder holder, GridTileLookupSystem gridLookup) public ReactionResult React(GasMixture mixture, IGasMixtureHolder holder, AtmosphereSystem atmosphereSystem)
{ {
var result = ReactionResult.NoReaction; var result = ReactionResult.NoReaction;
foreach (var effect in _effects) foreach (var effect in _effects)
{ {
result |= effect.React(mixture, holder, gridLookup); result |= effect.React(mixture, holder, atmosphereSystem);
} }
return result; return result;

9
Content.Server/Atmos/Reactions/PlasmaFireReaction.cs
View File

@@ -1,5 +1,6 @@
#nullable enable #nullable enable
using System; using System;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Coordinates.Helpers; using Content.Server.Coordinates.Helpers;
using Content.Server.Interfaces; using Content.Server.Interfaces;
using Content.Shared.Atmos; using Content.Shared.Atmos;
@@ -13,10 +14,10 @@ namespace Content.Server.Atmos.Reactions
[DataDefinition] [DataDefinition]
public class PlasmaFireReaction : IGasReactionEffect public class PlasmaFireReaction : IGasReactionEffect
{ {
public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, GridTileLookupSystem gridTileLookup) public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem)
{ {
var energyReleased = 0f; var energyReleased = 0f;
var oldHeatCapacity = mixture.HeatCapacity; var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture);
var temperature = mixture.Temperature; var temperature = mixture.Temperature;
var location = holder as TileAtmosphere; var location = holder as TileAtmosphere;
mixture.ReactionResults[GasReaction.Fire] = 0; mixture.ReactionResults[GasReaction.Fire] = 0;
@@ -63,7 +64,7 @@ namespace Content.Server.Atmos.Reactions
if (energyReleased > 0) if (energyReleased > 0)
{ {
var newHeatCapacity = mixture.HeatCapacity; var newHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture);
if (newHeatCapacity > Atmospherics.MinimumHeatCapacity) if (newHeatCapacity > Atmospherics.MinimumHeatCapacity)
mixture.Temperature = ((temperature * oldHeatCapacity + energyReleased) / newHeatCapacity); mixture.Temperature = ((temperature * oldHeatCapacity + energyReleased) / newHeatCapacity);
} }
@@ -75,7 +76,7 @@ namespace Content.Server.Atmos.Reactions
{ {
location.HotspotExpose(temperature, mixture.Volume); location.HotspotExpose(temperature, mixture.Volume);
foreach (var entity in location.GridIndices.GetEntitiesInTileFast(location.GridIndex, gridTileLookup)) foreach (var entity in location.GridIndices.GetEntitiesInTileFast(location.GridIndex))
{ {
foreach (var temperatureExpose in entity.GetAllComponents<ITemperatureExpose>()) foreach (var temperatureExpose in entity.GetAllComponents<ITemperatureExpose>())
{ {

9
Content.Server/Atmos/Reactions/TritiumFireReaction.cs
View File

@@ -1,4 +1,5 @@
#nullable enable #nullable enable
using Content.Server.Atmos.EntitySystems;
using Content.Server.Coordinates.Helpers; using Content.Server.Coordinates.Helpers;
using Content.Server.Interfaces; using Content.Server.Interfaces;
using Content.Shared.Atmos; using Content.Shared.Atmos;
@@ -12,10 +13,10 @@ namespace Content.Server.Atmos.Reactions
[DataDefinition] [DataDefinition]
public class TritiumFireReaction : IGasReactionEffect public class TritiumFireReaction : IGasReactionEffect
{ {
public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, GridTileLookupSystem gridTileLookup) public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem)
{ {
var energyReleased = 0f; var energyReleased = 0f;
var oldHeatCapacity = mixture.HeatCapacity; var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture);
var temperature = mixture.Temperature; var temperature = mixture.Temperature;
var location = holder as TileAtmosphere; var location = holder as TileAtmosphere;
mixture.ReactionResults[GasReaction.Fire] = 0f; mixture.ReactionResults[GasReaction.Fire] = 0f;
@@ -53,7 +54,7 @@ namespace Content.Server.Atmos.Reactions
if (energyReleased > 0) if (energyReleased > 0)
{ {
var newHeatCapacity = mixture.HeatCapacity; var newHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture);
if (newHeatCapacity > Atmospherics.MinimumHeatCapacity) if (newHeatCapacity > Atmospherics.MinimumHeatCapacity)
mixture.Temperature = ((temperature * oldHeatCapacity + energyReleased) / newHeatCapacity); mixture.Temperature = ((temperature * oldHeatCapacity + energyReleased) / newHeatCapacity);
} }
@@ -65,7 +66,7 @@ namespace Content.Server.Atmos.Reactions
{ {
location.HotspotExpose(temperature, mixture.Volume); location.HotspotExpose(temperature, mixture.Volume);
foreach (var entity in location.GridIndices.GetEntitiesInTileFast(location.GridIndex, gridTileLookup)) foreach (var entity in location.GridIndices.GetEntitiesInTileFast(location.GridIndex))
{ {
foreach (var temperatureExpose in entity.GetAllComponents<ITemperatureExpose>()) foreach (var temperatureExpose in entity.GetAllComponents<ITemperatureExpose>())
{ {

3
Content.Server/Atmos/Reactions/WaterVaporReaction.cs
View File

@@ -1,4 +1,5 @@
#nullable enable #nullable enable
using Content.Server.Atmos.EntitySystems;
using Content.Server.Fluids.Components; using Content.Server.Fluids.Components;
using Content.Server.Interfaces; using Content.Server.Interfaces;
using Content.Shared.Chemistry.Reagent; using Content.Shared.Chemistry.Reagent;
@@ -22,7 +23,7 @@ namespace Content.Server.Atmos.Reactions
[DataField("puddlePrototype")] public string? PuddlePrototype { get; } = "PuddleSmear"; [DataField("puddlePrototype")] public string? PuddlePrototype { get; } = "PuddleSmear";
public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, GridTileLookupSystem gridTileLookup) public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem)
{ {
// If any of the prototypes is invalid, we do nothing. // If any of the prototypes is invalid, we do nothing.
if (string.IsNullOrEmpty(Reagent) || string.IsNullOrEmpty(PuddlePrototype)) return ReactionResult.NoReaction; if (string.IsNullOrEmpty(Reagent) || string.IsNullOrEmpty(PuddlePrototype)) return ReactionResult.NoReaction;

60
Content.Server/Atmos/TileAtmosphere.cs
View File

@@ -5,6 +5,7 @@ using System.Buffers;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using Content.Server.Atmos.Components; using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Atmos.Reactions; using Content.Server.Atmos.Reactions;
using Content.Server.Coordinates.Helpers; using Content.Server.Coordinates.Helpers;
using Content.Server.Interfaces; using Content.Server.Interfaces;
@@ -12,6 +13,7 @@ using Content.Shared.Atmos;
using Content.Shared.Audio; using Content.Shared.Audio;
using Content.Shared.Maps; using Content.Shared.Maps;
using JetBrains.Annotations; using JetBrains.Annotations;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Shared.Audio; using Robust.Shared.Audio;
using Robust.Shared.Containers; using Robust.Shared.Containers;
@@ -197,7 +199,7 @@ namespace Content.Server.Atmos
} }
} }
public void EqualizePressureInZone(int cycleNum) public void EqualizePressureInZone(AtmosphereSystem atmosphereSystem, int cycleNum)
{ {
if (Air == null || (_tileAtmosInfo.LastCycle >= cycleNum)) return; // Already done. if (Air == null || (_tileAtmosInfo.LastCycle >= cycleNum)) return; // Already done.
@@ -504,7 +506,7 @@ namespace Content.Server.Atmos
for (var i = 0; i < tileCount; i++) for (var i = 0; i < tileCount; i++)
{ {
var tile = tiles[i]; var tile = tiles[i];
tile.FinalizeEq(); tile.FinalizeEq(atmosphereSystem);
} }
for (var i = 0; i < tileCount; i++) for (var i = 0; i < tileCount; i++)
@@ -526,7 +528,7 @@ namespace Content.Server.Atmos
ArrayPool<TileAtmosphere>.Shared.Return(takerTiles); ArrayPool<TileAtmosphere>.Shared.Return(takerTiles);
} }
private void FinalizeEq() private void FinalizeEq(AtmosphereSystem atmosphereSystem)
{ {
Span<float> transferDirections = stackalloc float[Atmospherics.Directions]; Span<float> transferDirections = stackalloc float[Atmospherics.Directions];
var hasTransferDirs = false; var hasTransferDirs = false;
@@ -551,10 +553,10 @@ namespace Content.Server.Atmos
if (amount > 0) if (amount > 0)
{ {
if (Air.TotalMoles < amount) if (Air.TotalMoles < amount)
FinalizeEqNeighbors(transferDirections); FinalizeEqNeighbors(atmosphereSystem, transferDirections);
tile._tileAtmosInfo[direction.GetOpposite()] = 0; tile._tileAtmosInfo[direction.GetOpposite()] = 0;
tile.Air.Merge(Air.Remove(amount)); atmosphereSystem.Merge(tile.Air, Air.Remove(amount));
UpdateVisuals(); UpdateVisuals();
tile.UpdateVisuals(); tile.UpdateVisuals();
ConsiderPressureDifference(tile, amount); ConsiderPressureDifference(tile, amount);
@@ -563,14 +565,14 @@ namespace Content.Server.Atmos
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private void FinalizeEqNeighbors(ReadOnlySpan<float> transferDirs) private void FinalizeEqNeighbors(AtmosphereSystem atmosphereSystem, ReadOnlySpan<float> transferDirs)
{ {
for (var i = 0; i < Atmospherics.Directions; i++) for (var i = 0; i < Atmospherics.Directions; i++)
{ {
var direction = (AtmosDirection) (1 << i); var direction = (AtmosDirection) (1 << i);
var amount = transferDirs[i]; var amount = transferDirs[i];
if(amount < 0 && _adjacentBits.IsFlagSet(direction)) if(amount < 0 && _adjacentBits.IsFlagSet(direction))
_adjacentTiles[i].FinalizeEq(); // A bit of recursion if needed. _adjacentTiles[i].FinalizeEq(atmosphereSystem); // A bit of recursion if needed.
} }
} }
@@ -592,7 +594,7 @@ namespace Content.Server.Atmos
_adjacentTiles[direction.ToIndex()]._tileAtmosInfo[direction.GetOpposite()] -= amount; _adjacentTiles[direction.ToIndex()]._tileAtmosInfo[direction.GetOpposite()] -= amount;
} }
public void ProcessCell(int fireCount, bool spaceWind = true) public void ProcessCell(AtmosphereSystem atmosphereSystem, int fireCount, bool spaceWind = true)
{ {
// Can't process a tile without air // Can't process a tile without air
if (Air == null) if (Air == null)
@@ -662,7 +664,7 @@ namespace Content.Server.Atmos
if (shouldShareAir) if (shouldShareAir)
{ {
var difference = Air.Share(enemyTile.Air, adjacentTileLength); var difference = atmosphereSystem.Share(Air, enemyTile.Air, adjacentTileLength);
if (spaceWind) if (spaceWind)
{ {
@@ -680,7 +682,8 @@ namespace Content.Server.Atmos
} }
} }
React(); if(Air != null)
_gridAtmosphereComponent.AtmosphereSystem.React(Air, this);
UpdateVisuals(); UpdateVisuals();
var remove = true; var remove = true;
@@ -715,7 +718,7 @@ namespace Content.Server.Atmos
ExcitedGroup?.ResetCooldowns(); ExcitedGroup?.ResetCooldowns();
if ((Hotspot.Temperature < Atmospherics.FireMinimumTemperatureToExist) || (Hotspot.Volume <= 1f) if ((Hotspot.Temperature < Atmospherics.FireMinimumTemperatureToExist) || (Hotspot.Volume <= 1f)
|| Air == null || Air.Gases[(int)Gas.Oxygen] < 0.5f || (Air.Gases[(int)Gas.Plasma] < 0.5f && Air.GetMoles(Gas.Tritium) < 0.5f)) || Air == null || Air.GetMoles(Gas.Oxygen) < 0.5f || (Air.GetMoles(Gas.Plasma) < 0.5f && Air.GetMoles(Gas.Tritium) < 0.5f))
{ {
Hotspot = new Hotspot(); Hotspot = new Hotspot();
UpdateVisuals(); UpdateVisuals();
@@ -767,7 +770,7 @@ namespace Content.Server.Atmos
{ {
var affected = Air.RemoveRatio(Hotspot.Volume / Air.Volume); var affected = Air.RemoveRatio(Hotspot.Volume / Air.Volume);
affected.Temperature = Hotspot.Temperature; affected.Temperature = Hotspot.Temperature;
affected.React(this); _gridAtmosphereComponent.AtmosphereSystem.React(affected, this);
Hotspot.Temperature = affected.Temperature; Hotspot.Temperature = affected.Temperature;
Hotspot.Volume = affected.ReactionResults[GasReaction.Fire] * Atmospherics.FireGrowthRate; Hotspot.Volume = affected.ReactionResults[GasReaction.Fire] * Atmospherics.FireGrowthRate;
AssumeAir(affected); AssumeAir(affected);
@@ -846,10 +849,10 @@ namespace Content.Server.Atmos
: Atmospherics.MinimumTemperatureForSuperconduction)) : Atmospherics.MinimumTemperatureForSuperconduction))
return false; return false;
return !(Air.HeatCapacity < Atmospherics.MCellWithRatio) && ConsiderSuperconductivity(); return !(_gridAtmosphereComponent.AtmosphereSystem.GetHeatCapacity(Air) < Atmospherics.MCellWithRatio) && ConsiderSuperconductivity();
} }
public void Superconduct() public void Superconduct(AtmosphereSystem atmosphereSystem)
{ {
var directions = ConductivityDirections(); var directions = ConductivityDirections();
@@ -867,22 +870,22 @@ namespace Content.Server.Atmos
if(adjacent._archivedCycle < _gridAtmosphereComponent.UpdateCounter) if(adjacent._archivedCycle < _gridAtmosphereComponent.UpdateCounter)
adjacent.Archive(_gridAtmosphereComponent.UpdateCounter); adjacent.Archive(_gridAtmosphereComponent.UpdateCounter);
adjacent.NeighborConductWithSource(this); adjacent.NeighborConductWithSource(atmosphereSystem, this);
adjacent.ConsiderSuperconductivity(); adjacent.ConsiderSuperconductivity();
} }
RadiateToSpace(); RadiateToSpace();
FinishSuperconduction(); FinishSuperconduction(atmosphereSystem);
} }
private void FinishSuperconduction() private void FinishSuperconduction(AtmosphereSystem atmosphereSystem)
{ {
// Conduct with air on my tile if I have it // Conduct with air on my tile if I have it
if (!BlocksAllAir) if (!BlocksAllAir)
{ {
Temperature = Air.TemperatureShare(ThermalConductivity, Temperature, HeatCapacity); Temperature = atmosphereSystem.TemperatureShare(Air, ThermalConductivity, Temperature, HeatCapacity);
} }
FinishSuperconduction(BlocksAllAir ? Temperature : Air.Temperature); FinishSuperconduction(BlocksAllAir ? Temperature : Air.Temperature);
@@ -897,13 +900,13 @@ namespace Content.Server.Atmos
} }
} }
private void NeighborConductWithSource(TileAtmosphere other) private void NeighborConductWithSource(AtmosphereSystem atmosphereSystem, TileAtmosphere other)
{ {
if (BlocksAllAir) if (BlocksAllAir)
{ {
if (!other.BlocksAllAir) if (!other.BlocksAllAir)
{ {
other.TemperatureShareOpenToSolid(this); other.TemperatureShareOpenToSolid(atmosphereSystem, this);
} }
else else
{ {
@@ -916,20 +919,19 @@ namespace Content.Server.Atmos
if (!other.BlocksAllAir) if (!other.BlocksAllAir)
{ {
other.Air.TemperatureShare(Air, Atmospherics.WindowHeatTransferCoefficient); atmosphereSystem.TemperatureShare(other.Air, Air, Atmospherics.WindowHeatTransferCoefficient);
} }
else else
{ {
TemperatureShareOpenToSolid(other); TemperatureShareOpenToSolid(atmosphereSystem, other);
} }
_gridAtmosphereComponent.AddActiveTile(this); _gridAtmosphereComponent.AddActiveTile(this);
} }
private void TemperatureShareOpenToSolid(TileAtmosphere other) private void TemperatureShareOpenToSolid(AtmosphereSystem atmosphereSystem, TileAtmosphere other)
{ {
other.Temperature = other.Temperature = atmosphereSystem.TemperatureShare(Air, other.ThermalConductivity, other.Temperature, other.HeatCapacity);
Air.TemperatureShare(other.ThermalConductivity, other.Temperature, other.HeatCapacity);
} }
private void TemperatureShareMutualSolid(TileAtmosphere other, float conductionCoefficient) private void TemperatureShareMutualSolid(TileAtmosphere other, float conductionCoefficient)
@@ -1120,17 +1122,11 @@ namespace Content.Server.Atmos
} }
} }
private void React()
{
// TODO ATMOS I think this is enough? gotta make sure...
Air?.React(this);
}
public bool AssumeAir(GasMixture giver) public bool AssumeAir(GasMixture giver)
{ {
if (Air == null) return false; if (Air == null) return false;
Air.Merge(giver); EntitySystem.Get<AtmosphereSystem>().Merge(Air, giver);
UpdateVisuals(); UpdateVisuals();

8
Content.Server/Body/Behavior/LungBehavior.cs
View File

@@ -2,12 +2,14 @@
using System; using System;
using Content.Server.Atmos; using Content.Server.Atmos;
using Content.Server.Atmos.Components; using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Body.Circulatory; using Content.Server.Body.Circulatory;
using Content.Server.Body.Respiratory; using Content.Server.Body.Respiratory;
using Content.Server.Notification; using Content.Server.Notification;
using Content.Shared.Atmos; using Content.Shared.Atmos;
using Content.Shared.Body.Components; using Content.Shared.Body.Components;
using Content.Shared.MobState; using Content.Shared.MobState;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.Manager.Attributes;
@@ -67,7 +69,7 @@ namespace Content.Server.Body.Behavior
public void Transfer(GasMixture from, GasMixture to, float ratio) public void Transfer(GasMixture from, GasMixture to, float ratio)
{ {
to.Merge(from.RemoveRatio(ratio)); EntitySystem.Get<AtmosphereSystem>().Merge(to, from.RemoveRatio(ratio));
} }
public void ToBloodstream(GasMixture mixture) public void ToBloodstream(GasMixture mixture)
@@ -84,7 +86,7 @@ namespace Content.Server.Body.Behavior
var to = bloodstream.Air; var to = bloodstream.Air;
to.Merge(mixture); EntitySystem.Get<AtmosphereSystem>().Merge(to, mixture);
mixture.Clear(); mixture.Clear();
} }
@@ -189,7 +191,7 @@ namespace Content.Server.Body.Behavior
bloodstream.PumpToxins(Air); bloodstream.PumpToxins(Air);
var lungRemoved = Air.RemoveRatio(0.5f); var lungRemoved = Air.RemoveRatio(0.5f);
to.Merge(lungRemoved); EntitySystem.Get<AtmosphereSystem>().Merge(to, lungRemoved);
} }
} }

13
Content.Server/Body/Circulatory/BloodstreamComponent.cs
View File

@@ -1,5 +1,7 @@
using System;
using System.Linq; using System.Linq;
using Content.Server.Atmos; using Content.Server.Atmos;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Chemistry.Components; using Content.Server.Chemistry.Components;
using Content.Server.Interfaces; using Content.Server.Interfaces;
using Content.Server.Metabolism; using Content.Server.Metabolism;
@@ -69,17 +71,20 @@ namespace Content.Server.Body.Circulatory
public void PumpToxins(GasMixture to) public void PumpToxins(GasMixture to)
{ {
var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
if (!Owner.TryGetComponent(out MetabolismComponent? metabolism)) if (!Owner.TryGetComponent(out MetabolismComponent? metabolism))
{ {
to.Merge(Air); atmosphereSystem.Merge(to, Air);
Air.Clear(); Air.Clear();
return; return;
} }
var toxins = metabolism.Clean(this); var toxins = metabolism.Clean(this);
var toOld = to.Gases.ToArray(); var toOld = new float[to.Moles.Length];
Array.Copy(to.Moles, toOld, toOld.Length);
to.Merge(toxins); atmosphereSystem.Merge(to, toxins);
for (var i = 0; i < toOld.Length; i++) for (var i = 0; i < toOld.Length; i++)
{ {
@@ -90,7 +95,7 @@ namespace Content.Server.Body.Circulatory
toxins.AdjustMoles(i, -delta); toxins.AdjustMoles(i, -delta);
} }
Air.Merge(toxins); atmosphereSystem.Merge(Air, toxins);
} }
} }
} }

4
Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs
View File

@@ -1,11 +1,13 @@
using System; using System;
using Content.Server.Atmos; using Content.Server.Atmos;
using Content.Server.Atmos.EntitySystems;
using Content.Shared.Atmos; using Content.Shared.Atmos;
using Content.Shared.Chemistry; using Content.Shared.Chemistry;
using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reaction;
using Content.Shared.Chemistry.Reagent; using Content.Shared.Chemistry.Reagent;
using Content.Shared.Maps; using Content.Shared.Maps;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.Manager.Attributes;
@@ -26,7 +28,7 @@ namespace Content.Server.Chemistry.TileReactions
MathF.Max(MathF.Min(tileAtmos.Air.Temperature - (_coolingTemperature * 1000f), MathF.Max(MathF.Min(tileAtmos.Air.Temperature - (_coolingTemperature * 1000f),
tileAtmos.Air.Temperature / _coolingTemperature), tileAtmos.Air.Temperature / _coolingTemperature),
Atmospherics.TCMB); Atmospherics.TCMB);
tileAtmos.Air.React(tileAtmos); EntitySystem.Get<AtmosphereSystem>().React(tileAtmos.Air, tileAtmos);
tileAtmos.Hotspot = new Hotspot(); tileAtmos.Hotspot = new Hotspot();
tileAtmos.UpdateVisuals(); tileAtmos.UpdateVisuals();
return ReagentUnit.Zero; return ReagentUnit.Zero;

4
Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs
View File

@@ -1,10 +1,12 @@
using System; using System;
using Content.Server.Atmos; using Content.Server.Atmos;
using Content.Server.Atmos.EntitySystems;
using Content.Shared.Chemistry; using Content.Shared.Chemistry;
using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reaction;
using Content.Shared.Chemistry.Reagent; using Content.Shared.Chemistry.Reagent;
using Content.Shared.Maps; using Content.Shared.Maps;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.Manager.Attributes;
@@ -22,7 +24,7 @@ namespace Content.Server.Chemistry.TileReactions
var tileAtmos = tile.GridPosition().GetTileAtmosphere(); var tileAtmos = tile.GridPosition().GetTileAtmosphere();
if (tileAtmos?.Air == null || !tileAtmos.Hotspot.Valid) return ReagentUnit.Zero; if (tileAtmos?.Air == null || !tileAtmos.Hotspot.Valid) return ReagentUnit.Zero;
tileAtmos.Air.Temperature *= MathF.Max(_temperatureMultiplier * reactVolume.Float(), 1f); tileAtmos.Air.Temperature *= MathF.Max(_temperatureMultiplier * reactVolume.Float(), 1f);
tileAtmos.Air.React(tileAtmos); EntitySystem.Get<AtmosphereSystem>().React(tileAtmos.Air, tileAtmos);
return reactVolume; return reactVolume;
} }
} }

3
Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs
View File

@@ -1,5 +1,6 @@
using System; using System;
using System.Linq; using System.Linq;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Disposal.Unit.Components; using Content.Server.Disposal.Unit.Components;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
@@ -28,7 +29,7 @@ namespace Content.Server.Disposal.Tube.Components
holderComponent.TryInsert(entity); holderComponent.TryInsert(entity);
} }
holderComponent.Air.Merge(from.Air); EntitySystem.Get<AtmosphereSystem>().Merge(holderComponent.Air, from.Air);
from.Air.Clear(); from.Air.Clear();
return TryInsert(holderComponent); return TryInsert(holderComponent);

4
Content.Server/Interfaces/IGasMixtureHolder.cs
View File

@@ -1,4 +1,6 @@
using Content.Server.Atmos; using Content.Server.Atmos;
using Content.Server.Atmos.EntitySystems;
using Robust.Shared.GameObjects;
namespace Content.Server.Interfaces namespace Content.Server.Interfaces
{ {
@@ -8,7 +10,7 @@ namespace Content.Server.Interfaces
public virtual void AssumeAir(GasMixture giver) public virtual void AssumeAir(GasMixture giver)
{ {
Air.Merge(giver); EntitySystem.Get<AtmosphereSystem>().Merge(Air, giver);
} }
public GasMixture RemoveAir(float amount) public GasMixture RemoveAir(float amount)

3
Content.Server/Interfaces/IGasReactionEffect.cs
View File

@@ -1,5 +1,6 @@
#nullable enable #nullable enable
using Content.Server.Atmos; using Content.Server.Atmos;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Atmos.Reactions; using Content.Server.Atmos.Reactions;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
@@ -7,6 +8,6 @@ namespace Content.Server.Interfaces
{ {
public interface IGasReactionEffect public interface IGasReactionEffect
{ {
ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, GridTileLookupSystem gridTileLookup); ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem);
} }
} }

9
Content.Server/NodeContainer/NodeGroups/IPipeNet.cs
View File

@@ -46,7 +46,7 @@ namespace Content.Server.NodeContainer.NodeGroups
public void Update() public void Update()
{ {
Air.React(this); EntitySystem.Get<AtmosphereSystem>().React(Air, this);
} }
protected override void OnAddNode(Node node) protected override void OnAddNode(Node node)
@@ -74,7 +74,7 @@ namespace Content.Server.NodeContainer.NodeGroups
if (newGroup is not IPipeNet newPipeNet) if (newGroup is not IPipeNet newPipeNet)
return; return;
newPipeNet.Air.Merge(Air); EntitySystem.Get<AtmosphereSystem>().Merge(newPipeNet.Air, Air);
} }
protected override void AfterRemake(IEnumerable<INodeGroup> newGroups) protected override void AfterRemake(IEnumerable<INodeGroup> newGroups)
@@ -82,6 +82,7 @@ namespace Content.Server.NodeContainer.NodeGroups
RemoveFromGridAtmos(); RemoveFromGridAtmos();
var buffer = new GasMixture(Air.Volume) {Temperature = Air.Temperature}; var buffer = new GasMixture(Air.Volume) {Temperature = Air.Temperature};
var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
foreach (var newGroup in newGroups) foreach (var newGroup in newGroups)
{ {
@@ -91,9 +92,9 @@ namespace Content.Server.NodeContainer.NodeGroups
var newAir = newPipeNet.Air; var newAir = newPipeNet.Air;
buffer.Clear(); buffer.Clear();
buffer.Merge(Air); atmosphereSystem.Merge(buffer, Air);
buffer.Multiply(MathF.Min(newAir.Volume / Air.Volume, 1f)); buffer.Multiply(MathF.Min(newAir.Volume / Air.Volume, 1f));
newAir.Merge(buffer); atmosphereSystem.Merge(newAir, buffer);
} }
} }

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

@@ -1,6 +1,7 @@
#nullable enable #nullable enable
using System.Collections.Generic; using System.Collections.Generic;
using Content.Server.Atmos; using Content.Server.Atmos;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Interfaces; using Content.Server.Interfaces;
using Content.Server.NodeContainer; using Content.Server.NodeContainer;
using Content.Server.NodeContainer.NodeGroups; using Content.Server.NodeContainer.NodeGroups;
@@ -104,7 +105,7 @@ namespace Content.Server.GameObjects.Components.NodeContainer.Nodes
return; return;
} }
_pipeNet.Air.Merge(giver); EntitySystem.Get<AtmosphereSystem>().Merge(_pipeNet.Air, giver);
} }
[ViewVariables] [ViewVariables]

4
Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs
View File

@@ -14,7 +14,7 @@ namespace Content.Shared.Atmos.EntitySystems
protected readonly GasPrototype[] GasPrototypes = new GasPrototype[Atmospherics.TotalNumberOfGases]; protected readonly GasPrototype[] GasPrototypes = new GasPrototype[Atmospherics.TotalNumberOfGases];
private readonly SpriteSpecifier[] _gasOverlays = new SpriteSpecifier[Atmospherics.TotalNumberOfGases]; private readonly SpriteSpecifier?[] _gasOverlays = new SpriteSpecifier[Atmospherics.TotalNumberOfGases];
public override void Initialize() public override void Initialize()
{ {
@@ -39,6 +39,6 @@ namespace Content.Shared.Atmos.EntitySystems
public IEnumerable<GasPrototype> Gases => GasPrototypes; public IEnumerable<GasPrototype> Gases => GasPrototypes;
public SpriteSpecifier GetOverlay(int overlayId) => _gasOverlays[overlayId]; public SpriteSpecifier? GetOverlay(int overlayId) => _gasOverlays[overlayId];
} }
} }