diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs index a03f27b561..70f91a5dc1 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs @@ -178,7 +178,7 @@ namespace Content.Server.Atmos.EntitySystems if (tile.Hotspot.Bypassing) { - tile.Hotspot.Volume = tile.Air.ReactionResults[GasReaction.Fire] * Atmospherics.FireGrowthRate; + tile.Hotspot.Volume = tile.Air.ReactionResults[(byte)GasReaction.Fire] * Atmospherics.FireGrowthRate; tile.Hotspot.Temperature = tile.Air.Temperature; } else @@ -187,7 +187,7 @@ namespace Content.Server.Atmos.EntitySystems affected.Temperature = tile.Hotspot.Temperature; React(affected, tile); tile.Hotspot.Temperature = affected.Temperature; - tile.Hotspot.Volume = affected.ReactionResults[GasReaction.Fire] * Atmospherics.FireGrowthRate; + tile.Hotspot.Volume = affected.ReactionResults[(byte)GasReaction.Fire] * Atmospherics.FireGrowthRate; Merge(tile.Air, affected); } diff --git a/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs b/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs index 98d567d4ed..b214310da1 100644 --- a/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs +++ b/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs @@ -15,7 +15,7 @@ namespace Content.Server.Atmos.Reactions var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture, true); var temperature = mixture.Temperature; var location = holder as TileAtmosphere; - mixture.ReactionResults[GasReaction.Fire] = 0; + mixture.ReactionResults[(byte)GasReaction.Fire] = 0; // More plasma released at higher temperatures. var temperatureScale = 0f; @@ -60,7 +60,7 @@ namespace Content.Server.Atmos.Reactions energyReleased += Atmospherics.FirePlasmaEnergyReleased * plasmaBurnRate; energyReleased /= heatScale; // adjust energy to make sure speedup doesn't cause mega temperature rise - mixture.ReactionResults[GasReaction.Fire] += plasmaBurnRate * (1 + oxygenBurnRate); + mixture.ReactionResults[(byte)GasReaction.Fire] += plasmaBurnRate * (1 + oxygenBurnRate); } } @@ -80,7 +80,7 @@ namespace Content.Server.Atmos.Reactions } } - return mixture.ReactionResults[GasReaction.Fire] != 0 ? ReactionResult.Reacting : ReactionResult.NoReaction; + return mixture.ReactionResults[(byte)GasReaction.Fire] != 0 ? ReactionResult.Reacting : ReactionResult.NoReaction; } } } diff --git a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs b/Content.Server/Atmos/Reactions/TritiumFireReaction.cs index 3ad0a4b04d..8b7d4e4872 100644 --- a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs +++ b/Content.Server/Atmos/Reactions/TritiumFireReaction.cs @@ -15,7 +15,7 @@ namespace Content.Server.Atmos.Reactions var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture, true); var temperature = mixture.Temperature; var location = holder as TileAtmosphere; - mixture.ReactionResults[GasReaction.Fire] = 0f; + mixture.ReactionResults[(byte)GasReaction.Fire] = 0f; var burnedFuel = 0f; var initialTrit = mixture.GetMoles(Gas.Tritium); @@ -45,7 +45,7 @@ namespace Content.Server.Atmos.Reactions // Conservation of mass is important. mixture.AdjustMoles(Gas.WaterVapor, burnedFuel); - mixture.ReactionResults[GasReaction.Fire] += burnedFuel; + mixture.ReactionResults[(byte)GasReaction.Fire] += burnedFuel; } energyReleased /= heatScale; // adjust energy to make sure speedup doesn't cause mega temperature rise @@ -65,7 +65,7 @@ namespace Content.Server.Atmos.Reactions } } - return mixture.ReactionResults[GasReaction.Fire] != 0 ? ReactionResult.Reacting : ReactionResult.NoReaction; + return mixture.ReactionResults[(byte)GasReaction.Fire] != 0 ? ReactionResult.Reacting : ReactionResult.NoReaction; } } } diff --git a/Content.Shared/Atmos/GasMixture.cs b/Content.Shared/Atmos/GasMixture.cs index deca8faaed..612626d614 100644 --- a/Content.Shared/Atmos/GasMixture.cs +++ b/Content.Shared/Atmos/GasMixture.cs @@ -33,10 +33,9 @@ namespace Content.Shared.Atmos public bool Immutable { get; private set; } [ViewVariables] - public readonly Dictionary ReactionResults = new() + public readonly float[] ReactionResults = { - // We initialize the dictionary here. - { GasReaction.Fire, 0f } + 0f, }; [ViewVariables]