Partial atmos refactor (#22521)
* Reduce atmos component queries * Remove method events * Cache airtight data * Make MolesArchived nullable * Fix airtight cache * only get tile def once * Immutable mixtures * firelock queries * misc * misc cleanup * Trim disconnected tiles * Fix merge issues and bugs * Why does the PR keep increasing in scope * debug overlay * Fix bugs * Fix test, remove unused events * Add setmapatmos command * Fix overlays * Add map check * A * Resolve conflicts with #26102 * Remove some obsolete methods
This commit is contained in:
@@ -1,9 +1,10 @@
|
||||
using Content.Server.Atmos.EntitySystems;
|
||||
using Content.Shared.Atmos;
|
||||
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
|
||||
|
||||
namespace Content.Server.Atmos.Components
|
||||
{
|
||||
[RegisterComponent]
|
||||
[RegisterComponent, Access(typeof(AirtightSystem))]
|
||||
public sealed partial class AirtightComponent : Component
|
||||
{
|
||||
public (EntityUid Grid, Vector2i Tile) LastPosition { get; set; }
|
||||
@@ -29,6 +30,7 @@ namespace Content.Server.Atmos.Components
|
||||
[DataField("noAirWhenFullyAirBlocked")]
|
||||
public bool NoAirWhenFullyAirBlocked { get; set; } = true;
|
||||
|
||||
[Access(Other = AccessPermissions.ReadWriteExecute)]
|
||||
public AtmosDirection AirBlockedDirection => (AtmosDirection)CurrentAirBlockedDirection;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,6 +28,9 @@ namespace Content.Server.Atmos.Components
|
||||
[IncludeDataField(customTypeSerializer:typeof(TileAtmosCollectionSerializer))]
|
||||
public Dictionary<Vector2i, TileAtmosphere> Tiles = new(1000);
|
||||
|
||||
[ViewVariables]
|
||||
public HashSet<TileAtmosphere> MapTiles = new(1000);
|
||||
|
||||
[ViewVariables]
|
||||
public readonly HashSet<TileAtmosphere> ActiveTiles = new(1000);
|
||||
|
||||
@@ -80,7 +83,10 @@ namespace Content.Server.Atmos.Components
|
||||
public readonly HashSet<Vector2i> InvalidatedCoords = new(1000);
|
||||
|
||||
[ViewVariables]
|
||||
public readonly Queue<Vector2i> CurrentRunInvalidatedCoordinates = new();
|
||||
public readonly Queue<TileAtmosphere> CurrentRunInvalidatedTiles = new();
|
||||
|
||||
[ViewVariables]
|
||||
public readonly List<TileAtmosphere> PossiblyDisconnectedTiles = new(100);
|
||||
|
||||
[ViewVariables]
|
||||
public int InvalidatedCoordsCount => InvalidatedCoords.Count;
|
||||
|
||||
@@ -12,12 +12,14 @@ public sealed partial class MapAtmosphereComponent : SharedMapAtmosphereComponen
|
||||
/// <summary>
|
||||
/// The default GasMixture a map will have. Space mixture by default.
|
||||
/// </summary>
|
||||
[DataField("mixture"), ViewVariables(VVAccess.ReadWrite)]
|
||||
public GasMixture? Mixture = GasMixture.SpaceGas;
|
||||
[DataField, ViewVariables(VVAccess.ReadWrite)]
|
||||
public GasMixture Mixture = GasMixture.SpaceGas;
|
||||
|
||||
/// <summary>
|
||||
/// Whether empty tiles will be considered space or not.
|
||||
/// </summary>
|
||||
[DataField("space"), ViewVariables(VVAccess.ReadWrite)]
|
||||
[DataField, ViewVariables(VVAccess.ReadWrite)]
|
||||
public bool Space = true;
|
||||
|
||||
public SharedGasTileOverlaySystem.GasOverlayData Overlay;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user