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:
committed by
GitHub
parent
43216a000f
commit
aa9281d667
@@ -115,7 +115,7 @@ namespace Content.Server.StationEvents.Events
|
||||
_timeUntilLeak += LeakCooldown;
|
||||
|
||||
var atmosphereSystem = _entityManager.EntitySysManager.GetEntitySystem<AtmosphereSystem>();
|
||||
|
||||
|
||||
if (!_foundTile ||
|
||||
_targetGrid == default ||
|
||||
_entityManager.Deleted(_targetGrid) ||
|
||||
@@ -125,7 +125,7 @@ namespace Content.Server.StationEvents.Events
|
||||
return;
|
||||
}
|
||||
|
||||
var environment = atmosphereSystem.GetTileMixture(_targetGrid, _targetTile, true);
|
||||
var environment = atmosphereSystem.GetTileMixture(_targetGrid, null, _targetTile, true);
|
||||
|
||||
environment?.AdjustMoles(_leakGas, LeakCooldown * _molesPerSecond);
|
||||
}
|
||||
|
||||
@@ -227,7 +227,8 @@ namespace Content.Server.StationEvents.Events
|
||||
|
||||
targetGrid = robustRandom.Pick(possibleTargets);
|
||||
|
||||
if (!entityManager.TryGetComponent<IMapGridComponent>(targetGrid, out var gridComp))
|
||||
if (!entityManager.TryGetComponent<IMapGridComponent>(targetGrid, out var gridComp)
|
||||
|| !entityManager.TryGetComponent<TransformComponent>(targetGrid, out var transform))
|
||||
return false;
|
||||
var grid = gridComp.Grid;
|
||||
|
||||
@@ -242,7 +243,9 @@ namespace Content.Server.StationEvents.Events
|
||||
var randomY = robustRandom.Next((int) gridBounds.Bottom, (int) gridBounds.Top);
|
||||
|
||||
tile = new Vector2i(randomX - (int) gridPos.X, randomY - (int) gridPos.Y);
|
||||
if (atmosphereSystem.IsTileSpace(grid, tile) || atmosphereSystem.IsTileAirBlocked(grid, tile)) continue;
|
||||
if (atmosphereSystem.IsTileSpace(grid.GridEntityId, transform.MapUid, tile, mapGridComp:gridComp)
|
||||
|| atmosphereSystem.IsTileAirBlocked(grid.GridEntityId, tile, mapGridComp:gridComp))
|
||||
continue;
|
||||
found = true;
|
||||
targetCoords = grid.GridTileToLocal(tile);
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user