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

Fix atmos NaN error (#26441)

Browse Source 
* Fix atmos NAN error

* Remove redundant yaml entries
This commit is contained in:
Leon Friedrich
2024-03-26 15:44:56 +11:00
committed by GitHub
parent 51a02c98fa
commit fdb4a61487
16 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Content.Server/Atmos/Components/AirtightComponent.cs
View File

@@ -9,27 +9,53 @@ namespace Content.Server.Atmos.Components
{
public (EntityUid Grid, Vector2i Tile) LastPosition { get; set; }
/// <summary>
/// The directions in which this entity should block airflow, relative to its own reference frame.
/// </summary>
[DataField("airBlockedDirection", customTypeSerializer: typeof(FlagSerializer<AtmosDirectionFlags>))]
public int InitialAirBlockedDirection { get; set; } = (int) AtmosDirection.All;
/// <summary>
/// The directions in which the entity is currently blocking airflow, relative to the grid that the entity is on.
/// I.e., this is a variant of <see cref="InitialAirBlockedDirection"/> that takes into account the entity's
/// current rotation.
/// </summary>
[ViewVariables]
public int CurrentAirBlockedDirection;
[DataField("airBlocked")]
/// <summary>
/// Whether the airtight entity is currently blocking airflow.
/// </summary>
[DataField]
public bool AirBlocked { get; set; } = true;
[DataField("fixVacuum")]
/// <summary>
/// If true, entities on this tile will attempt to draw air from surrounding tiles when they become unblocked
/// and currently have no air. This is generally only required when <see cref="NoAirWhenFullyAirBlocked"/> is
/// true, or if the entity is likely to occupy the same tile as another no-air airtight entity.
/// </summary>
[DataField]
public bool FixVacuum { get; set; } = true;
// I think fixvacuum exists to ensure that repeatedly closing/opening air-blocking doors doesn't end up
// depressurizing a room. However it can also effectively be used as a means of generating gasses for free
// TODO ATMOS Mass conservation. Make it actually push/pull air from adjacent tiles instead of destroying & creating,
// TODO ATMOS Do we need these two fields?
[DataField("rotateAirBlocked")]
public bool RotateAirBlocked { get; set; } = true;
// TODO ATMOS remove this? What is this even for??
[DataField("fixAirBlockedDirectionInitialize")]
public bool FixAirBlockedDirectionInitialize { get; set; } = true;
[DataField("noAirWhenFullyAirBlocked")]
/// <summary>
/// If true, then the tile that this entity is on will have no air at all if all directions are blocked.
/// </summary>
[DataField]
public bool NoAirWhenFullyAirBlocked { get; set; } = true;
/// <inheritdoc cref="CurrentAirBlockedDirection"/>
[Access(Other = AccessPermissions.ReadWriteExecute)]
public AtmosDirection AirBlockedDirection => (AtmosDirection)CurrentAirBlockedDirection;
}

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

@@ -85,8 +85,6 @@ namespace Content.Server.Atmos.EntitySystems
private bool AirtightMove(Entity<AirtightComponent> ent, ref MoveEvent ev)
{
var (owner, airtight) = ent;
if (!airtight.RotateAirBlocked || airtight.InitialAirBlockedDirection == (int)AtmosDirection.Invalid)
return false;
airtight.CurrentAirBlockedDirection = (int) Rotate((AtmosDirection)airtight.InitialAirBlockedDirection, ev.NewRotation);
var pos = airtight.LastPosition;

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

@@ -399,10 +399,7 @@ public sealed partial class AtmosphereSystem
args.Handled = true;
}
private void GridFixTileVacuum(
Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent,
TileAtmosphere tile,
float volume)
private void GridFixTileVacuum(TileAtmosphere tile)
{
DebugTools.AssertNotNull(tile.Air);
DebugTools.Assert(tile.Air?.Immutable == false );
@@ -416,6 +413,9 @@ public sealed partial class AtmosphereSystem
count++;
}
if (count == 0)
return;
var ratio = 1f / count;
var totalTemperature = 0f;

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

@@ -272,7 +272,7 @@ namespace Content.Server.Atmos.EntitySystems
tile.Air = new GasMixture(volume){Temperature = Atmospherics.T20C};
if (data.FixVacuum)
GridFixTileVacuum(ent, tile, volume);
GridFixTileVacuum(tile);
}
private void QueueRunTiles(

3
Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs
View File

@@ -78,12 +78,13 @@ public partial class AtmosphereSystem
if (!_airtightQuery.TryGetComponent(ent, out var airtight))
continue;
fixVacuum |= airtight.FixVacuum;
if(!airtight.AirBlocked)
continue;
blockedDirs |= airtight.AirBlockedDirection;
noAirWhenBlocked |= airtight.NoAirWhenFullyAirBlocked;
fixVacuum |= airtight.FixVacuum;
if (blockedDirs == AtmosDirection.All && noAirWhenBlocked && fixVacuum)
break;

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

@@ -62,9 +62,9 @@ namespace Content.Server.Atmos
get => _temperature;
set
{
DebugTools.Assert(!float.IsNaN(_temperature));
if (Immutable) return;
_temperature = MathF.Min(MathF.Max(value, Atmospherics.TCMB), Atmospherics.Tmax);
DebugTools.Assert(!float.IsNaN(value));
if (!Immutable)
_temperature = MathF.Min(MathF.Max(value, Atmospherics.TCMB), Atmospherics.Tmax);
}
}
@@ -91,6 +91,7 @@ namespace Content.Server.Atmos
if (volume < 0)
volume = 0;
DebugTools.Assert(!float.IsNaN(temp));
_temperature = temp;
Moles = moles;
Volume = volume;

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

@@ -28,6 +28,9 @@ namespace Content.Server.Atmos
[ViewVariables]
public TileAtmosphere? PressureSpecificTarget { get; set; }
/// <summary>
/// This is either the pressure difference, or the quantity of moles transferred if monstermos is enabled.
/// </summary>
[ViewVariables]
public float PressureDifference { get; set; }

1
Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
View File

@@ -104,7 +104,6 @@
- key: enum.WiresUiKey.Key
type: WiresBoundUserInterface
- type: Airtight
fixVacuum: true
noAirWhenFullyAirBlocked: false
- type: RadiationBlocker
resistance: 3

1
Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
View File

@@ -80,7 +80,6 @@
- key: enum.WiresUiKey.Key
type: WiresBoundUserInterface
- type: Airtight
fixVacuum: true
- type: Occluder
- type: Damageable
damageContainer: StructuralInorganic

1
Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
View File

@@ -57,7 +57,6 @@
denySound:
path: /Audio/Machines/airlock_deny.ogg
- type: Airtight
fixVacuum: true
noAirWhenFullyAirBlocked: false
- type: Tag
tags:

2
Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
View File

@@ -93,7 +93,6 @@
- type: Physics
canCollide: false
- type: Airtight
fixVacuum: true
airBlocked: false
noAirWhenFullyAirBlocked: true
- type: RadiationBlocker
@@ -158,7 +157,6 @@
sprite: Structures/Doors/edge_door_hazard.rsi
snapCardinals: false
- type: Airtight
fixVacuum: true
airBlocked: false
noAirWhenFullyAirBlocked: false
airBlockedDirection:

1
Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
View File

@@ -40,7 +40,6 @@
path: /Audio/Effects/stonedoor_openclose.ogg
- type: Appearance
- type: Airtight
fixVacuum: true
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic

1
Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
View File

@@ -38,7 +38,6 @@
- type: Weldable
time: 2
- type: Airtight
fixVacuum: true
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic

1
Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
View File

@@ -59,7 +59,6 @@
- key: enum.WiresUiKey.Key
type: WiresBoundUserInterface
- type: Airtight
fixVacuum: true
- type: RadiationBlocker
resistance: 2
- type: Damageable

1
Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
View File

@@ -130,7 +130,6 @@
- type: Appearance
- type: WiresVisuals
- type: Airtight
fixVacuum: true
noAirWhenFullyAirBlocked: false
airBlockedDirection:
- South

2
Resources/Prototypes/Entities/Structures/plastic_flaps.yml
View File

@@ -83,7 +83,6 @@
- !type:DoActsBehavior
acts: ["Destruction"]
- type: Airtight
fixVacuum: true
- type: entity
id: PlasticFlapsAirtightOpaque
@@ -101,4 +100,3 @@
- !type:DoActsBehavior
acts: ["Destruction"]
- type: Airtight
fixVacuum: true