Refactors the AtmosphereSystem public-facing API to allow for multiple atmos backends. (#8134)

* Refactors the entirety of the AtmosphereSystem public-facing API to allow for multiple atmos backends.

* actually compiles

* Remove commented out code

* funny bracket

* Move archived moles, temperature from GasMixture to TileAtmosphere.

* WIP customizable map default mixture
still VERY buggy

* broken mess
aaaaaaaaaaaaa

* Fix lattice, etc not being considered space

* visualization for "IsSpace"

* help

* Update Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs

Co-authored-by: Moony <moonheart08@users.noreply.github.com>

* Holy SHIT it compiles AGAIN

* Fix AtmosDeviceSystem crash at shutdown

* Fix immutable tiles on map blueprints not being fixed by fixgridatmos/revalidate.

* Use space instead of gasmixture immutable for heat capacity calculations

* Remove all LINDA-specific code from GasMixture, move it to TileAtmosphere/AtmosphereSystem instead.

* Fix roundstart tiles not processing

* Update Content.Server/Atmos/Commands/SetTemperatureCommand.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Update Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs

Changed Files tab is so large I can't commit both suggestions at once mfw

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

Co-authored-by: Moony <moonheart08@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
Vera Aguilera Puerto
2022-07-04 16:51:34 +02:00
committed by GitHub
parent 43216a000f
commit aa9281d667
74 changed files with 1764 additions and 2141 deletions

View File

@@ -5,6 +5,7 @@ using Content.Server.UserInterface;
using Content.Shared.Atmos;
using Content.Shared.Atmos.Components;
using Content.Shared.Interaction;
using Content.Shared.Maps;
using Content.Shared.Popups;
using Robust.Server.GameObjects;
using Robust.Server.Player;
@@ -120,7 +121,7 @@ namespace Content.Server.Atmos.Components
{
// Already get the pressure before Dirty(), because we can't get the EntitySystem in that thread or smth
var pressure = 0f;
var tile = EntitySystem.Get<AtmosphereSystem>().GetTileMixture(_entities.GetComponent<TransformComponent>(Owner).Coordinates);
var tile = EntitySystem.Get<AtmosphereSystem>().GetContainingMixture(Owner, true);
if (tile != null)
{
pressure = tile.Pressure;
@@ -178,8 +179,12 @@ namespace Content.Server.Atmos.Components
pos = _position.Value;
}
var gridUid = pos.GetGridUid(_entities);
var mapUid = pos.GetMapUid(_entities);
var position = pos.ToVector2i(_entities, IoCManager.Resolve<IMapManager>());
var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
var tile = atmosphereSystem.GetTileMixture(pos);
var tile = atmosphereSystem.GetTileMixture(gridUid, mapUid, position);
if (tile == null)
{
error = "No Atmosphere!";

View File

@@ -261,7 +261,7 @@ namespace Content.Server.Atmos.Components
{
if (_integrity <= 0)
{
var environment = atmosphereSystem.GetTileMixture(_entMan.GetComponent<TransformComponent>(Owner).Coordinates, true);
var environment = atmosphereSystem.GetContainingMixture(Owner, false, true);
if(environment != null)
atmosphereSystem.Merge(environment, Air);
@@ -279,7 +279,7 @@ namespace Content.Server.Atmos.Components
{
if (_integrity <= 0)
{
var environment = atmosphereSystem.GetTileMixture(_entMan.GetComponent<TransformComponent>(Owner).Coordinates, true);
var environment = atmosphereSystem.GetContainingMixture(Owner, false, true);
if (environment == null)
return;

View File

@@ -8,12 +8,12 @@ namespace Content.Server.Atmos.Components
/// <summary>
/// Internal Atmos class. Use <see cref="AtmosphereSystem"/> to interact with atmos instead.
/// </summary>
[ComponentReference(typeof(IAtmosphereComponent))]
[RegisterComponent, Serializable]
[Virtual]
public class GridAtmosphereComponent : Component, IAtmosphereComponent, ISerializationHooks
[RegisterComponent, Serializable,
Access(typeof(AtmosphereSystem), typeof(GasTileOverlaySystem), typeof(AtmosDebugOverlaySystem))]
public sealed class GridAtmosphereComponent : Component, ISerializationHooks
{
public virtual bool Simulated => true;
[ViewVariables(VVAccess.ReadWrite)]
public bool Simulated { get; set; } = true;
[ViewVariables]
public bool ProcessingPaused { get; set; } = false;
@@ -22,7 +22,7 @@ namespace Content.Server.Atmos.Components
public float Timer { get; set; } = 0f;
[ViewVariables]
public int UpdateCounter { get; set; } = 0;
public int UpdateCounter { get; set; } = 1; // DO NOT SET TO ZERO BY DEFAULT! It will break roundstart atmos...
[DataField("uniqueMixes")]
public List<GasMixture>? UniqueMixes;
@@ -94,7 +94,7 @@ namespace Content.Server.Atmos.Components
public long EqualizationQueueCycleControl { get; set; }
[ViewVariables]
public AtmosphereProcessingState State { get; set; } = AtmosphereProcessingState.TileEqualize;
public AtmosphereProcessingState State { get; set; } = AtmosphereProcessingState.Revalidate;
void ISerializationHooks.BeforeSerialization()
{

View File

@@ -1,10 +0,0 @@
namespace Content.Server.Atmos.Components
{
public interface IAtmosphereComponent : IComponent
{
/// <summary>
/// Whether this atmosphere is simulated or not.
/// </summary>
bool Simulated { get; }
}
}

View File

@@ -0,0 +1,21 @@
namespace Content.Server.Atmos.Components;
/// <summary>
/// Component that defines the default GasMixture for a map.
/// </summary>
/// <remarks>Honestly, no need to [Friend] this. It's just two simple data fields... Change them to your heart's content.</remarks>
[RegisterComponent]
public sealed class MapAtmosphereComponent : Component
{
/// <summary>
/// The default GasMixture a map will have. Space mixture by default.
/// </summary>
[DataField("mixture"), ViewVariables(VVAccess.ReadWrite)]
public GasMixture? Mixture = GasMixture.SpaceGas;
/// <summary>
/// Whether empty tiles will be considered space or not.
/// </summary>
[DataField("space"), ViewVariables(VVAccess.ReadWrite)]
public bool Space = true;
}

View File

@@ -1,9 +0,0 @@
namespace Content.Server.Atmos.Components
{
[RegisterComponent]
[ComponentReference(typeof(IAtmosphereComponent))]
public sealed class SpaceAtmosphereComponent : Component, IAtmosphereComponent
{
public bool Simulated => false;
}
}

View File

@@ -1,10 +0,0 @@
namespace Content.Server.Atmos.Components
{
[RegisterComponent]
[ComponentReference(typeof(IAtmosphereComponent))]
[Serializable]
public sealed class UnsimulatedGridAtmosphereComponent : GridAtmosphereComponent
{
public override bool Simulated => false;
}
}