tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ECS Atmos Part 3: Removes AtmosHelpers, add many methods to AtmosphereSystem. (#4285)

Browse Source 
* ECS Atmos Part 3: Removes AtmosHelpers, add many methods to AtmosphereSystem

* Adds API for adding/removing active tiles.

* Adds API for FixVacuum.

* Adds API for UpdateAdjacent.

* Adds API for IsTileAirBlocked.

* Re-organize hotspot code

* Adds API for IsTileSpace.

* RemoveGasCommand uses AtmosphereSystem

* AddGasCommand uses AtmosphereSystem.

* SetTemperatureCommand uses AtmosphereSystem.

* Adds API for IsSimulatedGrid.

* GasLeak uses AtmosphereSystem.

* Makes Spark method in GasLeak ALSO use AtmosphereSystem.

* GasPassiveVentSystem uses AtmosphereSystem.

* GasMinerSystem uses AtmosphereSystem.

* GasOutletInjectorSystem uses AtmosphereSystem.

* GasVentPumpSystem uses AtmosphereSystem.

* GasDualPortVentPumpSystem uses AtmosphereSystem.

* GasVolumePumpSystem uses AtmosphereSystem.

* GasAnalyzerComponent uses AtmosphereSystem.

* Add API for GetAdjacentTileMixtures.

* GasVentScrubberSystem uses AtmosphereSystem.

* AirtightComponent uses AtmosphereSystem.

* GasLeaks's TryFindRandomTile uses AtmosphereSystem.

* Adds API for GetAdjacentTiles.

* FirelockComponent's IsHoldingFire uses AtmosphereSystem.

* Adds API for GetAllTileMixtures.

* DeleteGasCommand uses AtmosphereSystem.

* FixGridAtmos uses AtmosphereSystem.

* FillGasCommand uses AtmosphereSystem.

* SetAtmosTemperatureCommand uses AtmosphereSystem.
This commit is contained in:
Vera Aguilera Puerto
2021-07-19 12:07:37 +02:00
committed by GitHub
parent 10ced26b0d
commit c8ba345cdc
34 changed files with 1214 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
using Content.Server.Administration;
using Content.Server.Atmos;
using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Shared.Administration;
using Content.Shared.Atmos;
using Robust.Shared.Console;
@@ -25,7 +26,7 @@ namespace Content.Server.Commands.Atmos
}
var mapManager = IoCManager.Resolve<IMapManager>();
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);
@@ -40,32 +41,19 @@ namespace Content.Server.Commands.Atmos
continue;
}
if (!mapManager.TryGetGrid(new GridId(i), out var grid))
var gridId = new GridId(i);
if (!mapManager.TryGetGrid(gridId, out _))
{
shell.WriteError($"Grid \"{i}\" doesn't exist.");
continue;
}
if (!entityManager.TryGetEntity(grid.GridEntityId, out var entity))
foreach (var tile in atmosphereSystem.GetAllTileMixtures(gridId, true))
{
shell.WriteError($"Grid entity for grid \"{i}\" doesn't exist.");
continue;
}
var gridAtmosphere = new GridAtmosphereComponent() {Owner = entity};
// Inject dependencies manually or a NRE will eat your face.
IoCManager.InjectDependencies(gridAtmosphere);
entityManager.ComponentManager.AddComponent(entity, gridAtmosphere, true);
gridAtmosphere.RepopulateTiles();
foreach (var tile in gridAtmosphere)
{
tile.Air = (GasMixture) mixture.Clone();
tile.Air.Volume = gridAtmosphere.GetVolumeForCells(1);
tile.Invalidate();
tile.Clear();
atmosphereSystem.Merge(tile, mixture);
tile.Temperature = mixture.Temperature;
}
}
}