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

Refactors the AtmosphereSystem public-facing API to allow for multiple atmos backends. (#8134)

Browse Source 
* 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:
Vera Aguilera Puerto
2022-07-04 16:51:34 +02:00
committed by GitHub
parent 43216a000f
commit aa9281d667
74 changed files with 1764 additions and 2141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Chemistry/ReagentEffects/CreateGas.cs
View File

@@ -21,10 +21,9 @@ public sealed class CreateGas : ReagentEffect
public override void Effect(ReagentEffectArgs args)
{
var atmosSys = EntitySystem.Get<AtmosphereSystem>();
var atmosSys = args.EntityManager.EntitySysManager.GetEntitySystem<AtmosphereSystem>();
var xform = args.EntityManager.GetComponent<TransformComponent>(args.SolutionEntity);
var tileMix = atmosSys.GetTileMixture(xform.Coordinates);
var tileMix = atmosSys.GetContainingMixture(args.SolutionEntity, false, true);
if (tileMix != null)
{

4
Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs
View File

@@ -21,7 +21,7 @@ namespace Content.Server.Chemistry.TileReactions
var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
var environment = atmosphereSystem.GetTileMixture(tile.GridUid, tile.GridIndices, true);
var environment = atmosphereSystem.GetTileMixture(tile.GridUid, null, tile.GridIndices, true);
if (environment == null || !atmosphereSystem.IsHotspotActive(tile.GridUid, tile.GridIndices))
return FixedPoint2.Zero;
@@ -30,7 +30,7 @@ namespace Content.Server.Chemistry.TileReactions
MathF.Max(MathF.Min(environment.Temperature - (_coolingTemperature * 1000f),
environment.Temperature / _coolingTemperature), Atmospherics.TCMB);
atmosphereSystem.React(tile.GridUid, tile.GridIndices);
atmosphereSystem.ReactTile(tile.GridUid, tile.GridIndices);
atmosphereSystem.HotspotExtinguish(tile.GridUid, tile.GridIndices);
return FixedPoint2.Zero;

4
Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs
View File

@@ -20,12 +20,12 @@ namespace Content.Server.Chemistry.TileReactions
var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
var environment = atmosphereSystem.GetTileMixture(tile.GridUid, tile.GridIndices, true);
var environment = atmosphereSystem.GetTileMixture(tile.GridUid, null, tile.GridIndices, true);
if (environment == null || !atmosphereSystem.IsHotspotActive(tile.GridUid, tile.GridIndices))
return FixedPoint2.Zero;
environment.Temperature *= MathF.Max(_temperatureMultiplier * reactVolume.Float(), 1f);
atmosphereSystem.React(tile.GridUid, tile.GridIndices);
atmosphereSystem.ReactTile(tile.GridUid, tile.GridIndices);
return reactVolume;
}