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

Add GetTileHeatCapacity methods to AtmosphereSystem, makes TemperatureSystem use them.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-11-30 12:00:13 +01:00
parent 6f455346b2
commit bc7463f744
2 changed files with 60 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
Content.Server/Atmos/EntitySystems/AtmosphereSystem.Grid.cs
View File

@@ -770,6 +770,65 @@ namespace Content.Server.Atmos.EntitySystems
#endregion
#region Tile Get Heat Capacity
/// <summary>
/// Get a tile's heat capacity, based on the tile type, tile contents and tile gas mixture.
/// </summary>
public float GetTileHeatCapacity(EntityCoordinates coordinates)
{
if (TryGetGridAndTile(coordinates, out var tuple))
return GetTileHeatCapacity(tuple.Value.Grid, tuple.Value.Tile);
return Atmospherics.MinimumHeatCapacity;
}
/// <summary>
/// Get a tile's heat capacity, based on the tile type, tile contents and tile gas mixture.
/// </summary>
public float GetTileHeatCapacity(GridId grid, Vector2i tile)
{
// Always return space gas mixtures for invalid grids (grid 0)
if (!grid.IsValid())
return Atmospherics.MinimumHeatCapacity;
if (!_mapManager.TryGetGrid(grid, out var mapGrid))
return Atmospherics.MinimumHeatCapacity;
if (EntityManager.TryGetComponent(mapGrid.GridEntityId, out GridAtmosphereComponent? gridAtmosphere))
{
return GetTileHeatCapacity(gridAtmosphere, tile);
}
if (EntityManager.TryGetComponent(mapGrid.GridEntityId, out SpaceAtmosphereComponent? _))
{
return Atmospherics.SpaceHeatCapacity;
}
return Atmospherics.MinimumHeatCapacity;
}
/// <summary>
/// Get a tile's heat capacity, based on the tile type, tile contents and tile gas mixture.
/// </summary>
public float GetTileHeatCapacity(GridAtmosphereComponent gridAtmosphere, Vector2i tile)
{
if (!gridAtmosphere.Tiles.TryGetValue(tile, out var tileAtmosphere))
return Atmospherics.MinimumHeatCapacity;
return GetTileHeatCapacity(tileAtmosphere);
}
/// <summary>
/// Get a tile's heat capacity, based on the tile type, tile contents and tile gas mixture.
/// </summary>
public float GetTileHeatCapacity(TileAtmosphere tile)
{
return tile.HeatCapacity + (tile.Air == null ? 0 : GetHeatCapacity(tile.Air));
}
#endregion
#region Adjacent Get Positions
/// <summary>

2
Content.Server/Temperature/Systems/TemperatureSystem.cs
View File

@@ -98,7 +98,7 @@ namespace Content.Server.Temperature.Systems
private void OnAtmosExposedUpdate(EntityUid uid, TemperatureComponent temperature, ref AtmosExposedUpdateEvent args)
{
var temperatureDelta = args.GasMixture.Temperature - temperature.CurrentTemperature;
var tileHeatCapacity = _atmosphereSystem.GetHeatCapacity(args.GasMixture);
var tileHeatCapacity = _atmosphereSystem.GetTileHeatCapacity(args.Coordinates);
var heat = temperatureDelta * (tileHeatCapacity * temperature.HeatCapacity / (tileHeatCapacity + temperature.HeatCapacity));
ChangeHeat(uid, heat * temperature.AtmosTemperatureTransferEfficiency, temperature: temperature );
}