Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

38
Content.Server/Commands/Atmos/AddGasCommand.cs
View File

@@ -1,5 +1,6 @@
using Content.Server.Administration;
using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Shared.Administration;
using Content.Shared.Atmos;
using Robust.Shared.Console;
@@ -28,46 +29,17 @@ namespace Content.Server.Commands.Atmos
var gridId = new GridId(id);
var mapMan = IoCManager.Resolve<IMapManager>();
if (!gridId.IsValid() || !mapMan.TryGetGrid(gridId, out var gridComp))
{
shell.WriteLine("Invalid grid ID.");
return;
}
var entMan = IoCManager.Resolve<IEntityManager>();
if (!entMan.TryGetEntity(gridComp.GridEntityId, out var grid))
{
shell.WriteLine("Failed to get grid entity.");
return;
}
if (!grid.HasComponent<GridAtmosphereComponent>())
{
shell.WriteLine("Grid doesn't have an atmosphere.");
return;
}
var gam = grid.GetComponent<GridAtmosphereComponent>();
var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
var indices = new Vector2i(x, y);
var tile = gam.GetTile(indices);
var tile = atmosphereSystem.GetTileMixture(gridId, indices, true);
if (tile == null)
{
shell.WriteLine("Invalid coordinates.");
shell.WriteLine("Invalid coordinates or tile.");
return;
}
if (tile.Air == null)
{
shell.WriteLine("Can't add gas to that tile.");
return;
}
tile.Air.AdjustMoles(gasId, moles);
tile.Invalidate();
tile.AdjustMoles(gasId, moles);
}
}
}

37
Content.Server/Commands/Atmos/DeleteGasCommand.cs
View File

@@ -1,6 +1,7 @@
using System;
using Content.Server.Administration;
using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Shared.Administration;
using Content.Shared.Atmos;
using Robust.Server.Player;
@@ -127,55 +128,39 @@ namespace Content.Server.Commands.Atmos
var mapManager = IoCManager.Resolve<IMapManager>();
if (!mapManager.TryGetGrid(gridId, out var grid))
if (!mapManager.TryGetGrid(gridId, out _))
{
shell.WriteLine($"No grid exists with id {gridId}");
return;
}
var entityManager = IoCManager.Resolve<IEntityManager>();
if (!entityManager.TryGetEntity(grid.GridEntityId, out var gridEntity))
{
shell.WriteLine($"Grid {gridId} has no entity.");
return;
}
if (!gridEntity.TryGetComponent(out GridAtmosphereComponent? atmosphere))
{
shell.WriteLine($"Grid {gridId} has no {nameof(GridAtmosphereComponent)}");
return;
}
var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
var tiles = 0;
var moles = 0f;
if (gas == null)
{
foreach (var tile in atmosphere)
foreach (var tile in atmosphereSystem.GetAllTileMixtures(gridId, true))
{
if (tile.Air == null || tile.Air.Immutable) continue;
if (tile.Immutable) continue;
tiles++;
moles += tile.Air.TotalMoles;
moles += tile.TotalMoles;
tile.Air.Clear();
tile.Invalidate();
tile.Clear();
}
}
else
{
foreach (var tile in atmosphere)
foreach (var tile in atmosphereSystem.GetAllTileMixtures(gridId, true))
{
if (tile.Air == null || tile.Air.Immutable) continue;
if (tile.Immutable) continue;
tiles++;
moles += tile.Air.TotalMoles;
moles += tile.TotalMoles;
tile.Air.SetMoles(gas.Value, 0);
tile.Invalidate();
tile.SetMoles(gas.Value, 0);
}
}

24
Content.Server/Commands/Atmos/FillGasCommand.cs
View File

@@ -1,5 +1,6 @@
using Content.Server.Administration;
using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Shared.Administration;
using Content.Shared.Atmos;
using Robust.Shared.Console;
@@ -27,32 +28,17 @@ namespace Content.Server.Commands.Atmos
var mapMan = IoCManager.Resolve<IMapManager>();
if (!gridId.IsValid() || !mapMan.TryGetGrid(gridId, out var gridComp))
if (!gridId.IsValid() || !mapMan.TryGetGrid(gridId, out _))
{
shell.WriteLine("Invalid grid ID.");
return;
}
var entMan = IoCManager.Resolve<IEntityManager>();
var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
if (!entMan.TryGetEntity(gridComp.GridEntityId, out var grid))
foreach (var tile in atmosphereSystem.GetAllTileMixtures(gridId, true))
{
shell.WriteLine("Failed to get grid entity.");
return;
}
if (!grid.HasComponent<IGridAtmosphereComponent>())
{
shell.WriteLine("Grid doesn't have an atmosphere.");
return;
}
var gam = grid.GetComponent<IGridAtmosphereComponent>();
foreach (var tile in gam)
{
tile.Air?.AdjustMoles(gasId, moles);
tile.Invalidate();
tile.AdjustMoles(gasId, moles);
}
}
}

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;
}
}
}

41
Content.Server/Commands/Atmos/RemoveGasCommand.cs
View File

@@ -1,5 +1,6 @@
using Content.Server.Administration;
using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Shared.Administration;
using Robust.Shared.Console;
using Robust.Shared.GameObjects;
@@ -27,50 +28,20 @@ namespace Content.Server.Commands.Atmos
var gridId = new GridId(id);
var mapMan = IoCManager.Resolve<IMapManager>();
if (!gridId.IsValid() || !mapMan.TryGetGrid(gridId, out var gridComp))
{
shell.WriteLine("Invalid grid ID.");
return;
}
var entMan = IoCManager.Resolve<IEntityManager>();
if (!entMan.TryGetEntity(gridComp.GridEntityId, out var grid))
{
shell.WriteLine("Failed to get grid entity.");
return;
}
if (!grid.HasComponent<GridAtmosphereComponent>())
{
shell.WriteLine("Grid doesn't have an atmosphere.");
return;
}
var gam = grid.GetComponent<GridAtmosphereComponent>();
var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
var indices = new Vector2i(x, y);
var tile = gam.GetTile(indices);
var tile = atmosphereSystem.GetTileMixture(gridId, indices, true);
if (tile == null)
{
shell.WriteLine("Invalid coordinates.");
return;
}
if (tile.Air == null)
{
shell.WriteLine("Can't remove gas from that tile.");
shell.WriteLine("Invalid coordinates or tile.");
return;
}
if (ratio)
tile.Air.RemoveRatio(amount);
tile.RemoveRatio(amount);
else
tile.Air.Remove(amount);
tile.Invalidate();
tile.Remove(amount);
}
}

26
Content.Server/Commands/Atmos/SetAtmosTemperatureCommand.cs
View File

@@ -1,5 +1,6 @@
using Content.Server.Administration;
using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Shared.Administration;
using Content.Shared.Atmos;
using Robust.Shared.Console;
@@ -38,32 +39,13 @@ namespace Content.Server.Commands.Atmos
return;
}
var entMan = IoCManager.Resolve<IEntityManager>();
if (!entMan.TryGetEntity(gridComp.GridEntityId, out var grid))
{
shell.WriteLine("Failed to get grid entity.");
return;
}
if (!grid.HasComponent<GridAtmosphereComponent>())
{
shell.WriteLine("Grid doesn't have an atmosphere.");
return;
}
var gam = grid.GetComponent<GridAtmosphereComponent>();
var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
var tiles = 0;
foreach (var tile in gam)
foreach (var tile in atmosphereSystem.GetAllTileMixtures(gridId, true))
{
if (tile.Air == null)
continue;
tiles++;
tile.Air.Temperature = temperature;
tile.Invalidate();
tile.Temperature = temperature;
}
shell.WriteLine($"Changed the temperature of {tiles} tiles.");

38
Content.Server/Commands/Atmos/SetTemperatureCommand.cs
View File

@@ -1,5 +1,6 @@
using Content.Server.Administration;
using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Shared.Administration;
using Content.Shared.Atmos;
using Robust.Shared.Console;
@@ -27,52 +28,23 @@ namespace Content.Server.Commands.Atmos
var gridId = new GridId(id);
var mapMan = IoCManager.Resolve<IMapManager>();
if (temperature < Atmospherics.TCMB)
{
shell.WriteLine("Invalid temperature.");
return;
}
if (!gridId.IsValid() || !mapMan.TryGetGrid(gridId, out var gridComp))
{
shell.WriteLine("Invalid grid ID.");
return;
}
var entMan = IoCManager.Resolve<IEntityManager>();
if (!entMan.TryGetEntity(gridComp.GridEntityId, out var grid))
{
shell.WriteLine("Failed to get grid entity.");
return;
}
if (!grid.HasComponent<GridAtmosphereComponent>())
{
shell.WriteLine("Grid doesn't have an atmosphere.");
return;
}
var gam = grid.GetComponent<GridAtmosphereComponent>();
var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
var indices = new Vector2i(x, y);
var tile = gam.GetTile(indices);
var tile = atmosphereSystem.GetTileMixture(gridId, indices, true);
if (tile == null)
{
shell.WriteLine("Invalid coordinates.");
shell.WriteLine("Invalid coordinates or tile.");
return;
}
if (tile.Air == null)
{
shell.WriteLine("Can't change that tile's temperature.");
return;
}
tile.Air.Temperature = temperature;
tile.Invalidate();
tile.Temperature = temperature;
}
}
}