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

Varied and semi-sprited atmos markers (#4944)

Browse Source
This commit is contained in:
20kdc
2021-10-19 20:07:47 +01:00
committed by GitHub
parent 88c8f3400b
commit 7ccf9668d4
14 changed files with 165 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Content.Server/Atmos/Commands/FixGridAtmos.cs
View File

@@ -29,9 +29,24 @@ namespace Content.Server.Atmos.Commands
var entityManager = IoCManager.Resolve<IEntityManager>();
var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
var mixture = new GasMixture(Atmospherics.CellVolume) { Temperature = Atmospherics.T20C };
mixture.AdjustMoles(Gas.Oxygen, Atmospherics.OxygenMolesStandard);
mixture.AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesStandard);
var mixtures = new GasMixture[5];
for (var i = 0; i < mixtures.Length; i++)
mixtures[i] = new GasMixture(Atmospherics.CellVolume) { Temperature = Atmospherics.T20C };
// 0: Air
mixtures[0].AdjustMoles(Gas.Oxygen, Atmospherics.OxygenMolesStandard);
mixtures[0].AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesStandard);
// 1: Vaccum
// 2: Oxygen (GM)
mixtures[2].AdjustMoles(Gas.Oxygen, Atmospherics.MolesCellGasMiner);
// 3: Nitrogen (GM)
mixtures[3].AdjustMoles(Gas.Nitrogen, Atmospherics.MolesCellGasMiner);
// 4: Plasma (GM)
mixtures[4].AdjustMoles(Gas.Plasma, Atmospherics.MolesCellGasMiner);
foreach (var gid in args)
{
@@ -63,19 +78,16 @@ namespace Content.Server.Atmos.Commands
continue;
tile.Clear();
var blocker = false;
var mixtureId = 0;
foreach (var entUid in mapGrid.GetAnchoredEntities(indices))
{
if (!entityManager.TryGetComponent(entUid, out TagComponent? tags))
if (!entityManager.TryGetComponent(entUid, out AtmosFixMarkerComponent? afm))
continue;
if (tags.HasTag("AtmosFixBlocking"))
{
blocker = true;
break;
}
mixtureId = afm.Mode;
break;
}
if (!blocker)
atmosphereSystem.Merge(tile, mixture);
var mixture = mixtures[mixtureId];
atmosphereSystem.Merge(tile, mixture);
tile.Temperature = mixture.Temperature;
atmosphereSystem.InvalidateTile(gridAtmosphere, indices);

21
Content.Server/Atmos/Components/AtmosFixMarkerComponent.cs Normal file
View File

@@ -0,0 +1,21 @@
using Content.Server.Atmos.EntitySystems;
using Content.Server.Temperature.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Server.Atmos.Components
{
/// <summary>
/// Used by FixGridAtmos. Entities with this may get magically auto-deleted on map initialization in future.
/// </summary>
[RegisterComponent]
public class AtmosFixMarkerComponent : Component
{
public override string Name => "AtmosFixMarker";
// See FixGridAtmos for more details
[DataField("mode")]
public int Mode { get; set; } = 0;
}
}

2
Content.Server/Atmos/Piping/Other/Components/GasMinerComponent.cs
View File

@@ -20,7 +20,7 @@ namespace Content.Server.Atmos.Piping.Other.Components
[ViewVariables(VVAccess.ReadWrite)]
[DataField("maxExternalPressure")]
public float MaxExternalPressure { get; set; } = 6500f;
public float MaxExternalPressure { get; set; } = Atmospherics.GasMinerDefaultMaxExternalPressure;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("spawnGas")]