forked from space-wizards/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* add 11 new gas types * fix hypernob + plasma and trit fire * actually fix hypernob
- Loading branch information
1 parent
82de679
commit 96f36f3
Showing
72 changed files
with
2,603 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
using Content.Server.Atmos.EntitySystems; | ||
using Content.Shared.Atmos; | ||
using JetBrains.Annotations; | ||
|
||
namespace Content.Server.Atmos.Reactions; | ||
|
||
[UsedImplicitly] | ||
public sealed class BZProductionReaction : IGasReactionEffect | ||
{ | ||
public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) | ||
{ | ||
var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); | ||
if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) | ||
return ReactionResult.NoReaction; | ||
|
||
var initialNitrousOxide = mixture.GetMoles(Gas.NitrousOxide); | ||
var initialPlasma = mixture.GetMoles(Gas.Plasma); | ||
|
||
var environmentEfficiency = mixture.Volume / mixture.Pressure; | ||
var ratioEfficiency = Math.Min(initialNitrousOxide / initialPlasma, 1); | ||
|
||
var BZFormed = Math.Min(0.01f * ratioEfficiency * environmentEfficiency, Math.Min(initialNitrousOxide * 0.4f, initialPlasma * 0.8f)); | ||
|
||
if (initialNitrousOxide - BZFormed * 0.4f < 0 || initialPlasma - (0.8f - BZFormed) < 0 || BZFormed <= 0) | ||
return ReactionResult.NoReaction; | ||
|
||
var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture); | ||
|
||
var amountDecomposed = 0.0f; | ||
var nitrousOxideDecomposedFactor = Math.Max(4.0f * (initialPlasma / (initialNitrousOxide + initialPlasma) - 0.75f), 0); | ||
if (nitrousOxideDecomposedFactor > 0) | ||
{ | ||
amountDecomposed = 0.4f * BZFormed * nitrousOxideDecomposedFactor; | ||
mixture.AdjustMoles(Gas.Oxygen, amountDecomposed); | ||
mixture.AdjustMoles(Gas.Nitrogen, 0.5f * amountDecomposed); | ||
} | ||
|
||
mixture.AdjustMoles(Gas.BZ, Math.Max(0f, BZFormed * (1.0f - nitrousOxideDecomposedFactor))); | ||
mixture.AdjustMoles(Gas.NitrousOxide, -0.4f * BZFormed); | ||
mixture.AdjustMoles(Gas.Plasma, -0.8f * BZFormed * (1.0f - nitrousOxideDecomposedFactor)); | ||
|
||
var energyReleased = BZFormed * (Atmospherics.BZFormationEnergy + nitrousOxideDecomposedFactor * (Atmospherics.NitrousOxideDecompositionEnergy - Atmospherics.BZFormationEnergy)); | ||
|
||
var newHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture); | ||
if (newHeatCapacity > Atmospherics.MinimumHeatCapacity) | ||
mixture.Temperature = Math.Max((mixture.Temperature * oldHeatCapacity + energyReleased) / newHeatCapacity, Atmospherics.TCMB); | ||
|
||
return ReactionResult.Reacting; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
Content.Server/Atmos/Reactions/HalonOxygenAbsorptionReaction.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
using Content.Server.Atmos.EntitySystems; | ||
using Content.Shared.Atmos; | ||
using JetBrains.Annotations; | ||
|
||
namespace Content.Server.Atmos.Reactions; | ||
|
||
[UsedImplicitly] | ||
public sealed class HalonOxygenAbsorptionReaction : IGasReactionEffect | ||
{ | ||
public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) | ||
{ | ||
var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); | ||
if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) | ||
return ReactionResult.NoReaction; | ||
|
||
var initialHalon = mixture.GetMoles(Gas.Halon); | ||
var initialOxygen = mixture.GetMoles(Gas.Oxygen); | ||
|
||
var temperature = mixture.Temperature; | ||
|
||
var heatEfficiency = Math.Min(temperature / (Atmospherics.FireMinimumTemperatureToExist * 10f), Math.Min(initialHalon, initialOxygen*20f)); | ||
if (heatEfficiency <= 0f || initialHalon - heatEfficiency < 0f || initialOxygen - heatEfficiency * 20f < 0f) | ||
return ReactionResult.NoReaction; | ||
|
||
var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture); | ||
|
||
mixture.AdjustMoles(Gas.Halon, -heatEfficiency); | ||
mixture.AdjustMoles(Gas.Oxygen, -heatEfficiency*20f); | ||
mixture.AdjustMoles(Gas.CarbonDioxide, heatEfficiency*5f); | ||
|
||
var energyUsed = heatEfficiency * Atmospherics.HalonCombustionEnergy; | ||
var newHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture); | ||
if (newHeatCapacity > Atmospherics.MinimumHeatCapacity) | ||
mixture.Temperature = Math.Max((mixture.Temperature * oldHeatCapacity + energyUsed) / newHeatCapacity, Atmospherics.TCMB); | ||
|
||
return ReactionResult.Reacting; | ||
} | ||
} |
39 changes: 39 additions & 0 deletions
39
Content.Server/Atmos/Reactions/HealiumProductionReaction.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
using Content.Server.Atmos.EntitySystems; | ||
using Content.Shared.Atmos; | ||
using JetBrains.Annotations; | ||
|
||
namespace Content.Server.Atmos.Reactions; | ||
|
||
[UsedImplicitly] | ||
public sealed class HealiumProductionReaction : IGasReactionEffect | ||
{ | ||
public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) | ||
{ | ||
var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); | ||
if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) | ||
return ReactionResult.NoReaction; | ||
|
||
var initialBZ = mixture.GetMoles(Gas.BZ); | ||
var initialFrezon = mixture.GetMoles(Gas.Frezon); | ||
|
||
var temperature = mixture.Temperature; | ||
var heatEfficiency = Math.Min(temperature*0.3f, Math.Min(initialFrezon*2.75f, initialBZ*0.25f)); | ||
|
||
if (heatEfficiency <= 0 || initialFrezon - heatEfficiency * 2.75f < 0 || initialBZ - heatEfficiency * 0.25f < 0) | ||
return ReactionResult.NoReaction; | ||
|
||
var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture); | ||
|
||
mixture.AdjustMoles(Gas.Frezon, -heatEfficiency*2.75f); | ||
mixture.AdjustMoles(Gas.BZ, -heatEfficiency*0.25f); | ||
mixture.AdjustMoles(Gas.Healium, heatEfficiency*3); | ||
|
||
var energyReleased = heatEfficiency * Atmospherics.HealiumFormationEnergy; | ||
|
||
var newHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture); | ||
if (newHeatCapacity > Atmospherics.MinimumHeatCapacity) | ||
mixture.Temperature = Math.Max((mixture.Temperature * oldHeatCapacity + energyReleased) / newHeatCapacity, Atmospherics.TCMB); | ||
|
||
return ReactionResult.Reacting; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
using Content.Server.Atmos.EntitySystems; | ||
using Content.Shared.Atmos; | ||
using JetBrains.Annotations; | ||
|
||
namespace Content.Server.Atmos.Reactions | ||
{ | ||
[UsedImplicitly] | ||
[DataDefinition] | ||
public sealed class HydrogenFireReaction : IGasReactionEffect | ||
{ | ||
public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) | ||
{ | ||
var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); | ||
if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) | ||
return ReactionResult.NoReaction; | ||
|
||
var energyReleased = 0f; | ||
var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture); | ||
var temperature = mixture.Temperature; | ||
var location = holder as TileAtmosphere; | ||
mixture.ReactionResults[GasReaction.Fire] = 0; | ||
|
||
var initialOxygen = mixture.GetMoles(Gas.Oxygen); | ||
var initialHydrogen = mixture.GetMoles(Gas.Hydrogen); | ||
|
||
var burnedFuel = Math.Min(initialHydrogen / Atmospherics.FireH2BurnRateDelta, Math.Min(initialOxygen / (Atmospherics.FireH2BurnRateDelta * Atmospherics.H2OxygenFullBurn), Math.Min(initialHydrogen, initialOxygen * 0.5f))); | ||
|
||
if (burnedFuel > 0) | ||
{ | ||
energyReleased += Atmospherics.FireH2EnergyReleased * burnedFuel; | ||
|
||
mixture.AdjustMoles(Gas.WaterVapor, burnedFuel); | ||
mixture.AdjustMoles(Gas.Hydrogen, -burnedFuel); | ||
mixture.AdjustMoles(Gas.Oxygen, -burnedFuel * 0.5f); | ||
|
||
mixture.ReactionResults[GasReaction.Fire] += burnedFuel; | ||
} | ||
|
||
if (energyReleased > 0) | ||
{ | ||
var newHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture); | ||
if (newHeatCapacity > Atmospherics.MinimumHeatCapacity) | ||
mixture.Temperature = (temperature * oldHeatCapacity + energyReleased) / newHeatCapacity; | ||
} | ||
|
||
if (location != null) | ||
{ | ||
temperature = mixture.Temperature; | ||
if (temperature > Atmospherics.FireMinimumTemperatureToExist) | ||
{ | ||
atmosphereSystem.HotspotExpose(location.GridIndex, location.GridIndices, temperature, mixture.Volume); | ||
} | ||
} | ||
|
||
return mixture.ReactionResults[GasReaction.Fire] != 0 ? ReactionResult.Reacting : ReactionResult.NoReaction; | ||
} | ||
} | ||
} |
40 changes: 40 additions & 0 deletions
40
Content.Server/Atmos/Reactions/HyperNobliumProductionReaction.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
using Content.Server.Atmos.EntitySystems; | ||
using Content.Shared.Atmos; | ||
using JetBrains.Annotations; | ||
|
||
namespace Content.Server.Atmos.Reactions; | ||
|
||
[UsedImplicitly] | ||
public sealed class HyperNobliumProductionReaction : IGasReactionEffect | ||
{ | ||
public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) | ||
{ | ||
var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); | ||
if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) | ||
return ReactionResult.NoReaction; | ||
|
||
var initialNitrogen = mixture.GetMoles(Gas.Nitrogen); | ||
var initialTritium = mixture.GetMoles(Gas.Tritium); | ||
var initialBZ = mixture.GetMoles(Gas.BZ); | ||
|
||
var nobFormed = Math.Min((initialNitrogen+initialTritium)*0.01f,Math.Min(initialTritium*5f, initialNitrogen*10f)); | ||
if (nobFormed <= 0 || (initialTritium - 5f) * nobFormed < 0 || (initialNitrogen - 10f) * nobFormed < 0) | ||
return ReactionResult.NoReaction; | ||
|
||
var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture); | ||
|
||
var reductionFactor = Math.Clamp(initialTritium/(initialTritium+initialBZ), 0.001f, 1f); | ||
|
||
mixture.AdjustMoles(Gas.Tritium, -5f * nobFormed * reductionFactor); | ||
mixture.AdjustMoles(Gas.Nitrogen, -10f * nobFormed); | ||
mixture.AdjustMoles(Gas.HyperNoblium, nobFormed); | ||
|
||
var energyReleased = nobFormed * (Atmospherics.NobliumFormationEnergy/Math.Max(initialBZ, 1)); | ||
|
||
var newHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture); | ||
if (newHeatCapacity > Atmospherics.MinimumHeatCapacity) | ||
mixture.Temperature = Math.Max((mixture.Temperature * oldHeatCapacity + energyReleased) / newHeatCapacity, Atmospherics.TCMB); | ||
|
||
return ReactionResult.Reacting; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
Content.Server/Atmos/Reactions/NitriumDecompositionReaction.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
using Content.Server.Atmos.EntitySystems; | ||
using Content.Shared.Atmos; | ||
using JetBrains.Annotations; | ||
|
||
namespace Content.Server.Atmos.Reactions; | ||
|
||
[UsedImplicitly] | ||
public sealed class NitriumDecompositionReaction : IGasReactionEffect | ||
{ | ||
public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) | ||
{ | ||
var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); | ||
if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) | ||
return ReactionResult.NoReaction; | ||
|
||
var initialNitrium = mixture.GetMoles(Gas.Nitrium); | ||
|
||
var temperature = mixture.Temperature; | ||
var heatEfficiency = Math.Min(temperature / Atmospherics.NitriumDecompositionTempDivisor, initialNitrium); | ||
|
||
if (heatEfficiency <= 0 || initialNitrium - heatEfficiency < 0) | ||
return ReactionResult.NoReaction; | ||
|
||
var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture); | ||
|
||
mixture.AdjustMoles(Gas.Nitrium, -heatEfficiency); | ||
mixture.AdjustMoles(Gas.Hydrogen, heatEfficiency); | ||
mixture.AdjustMoles(Gas.Nitrogen, heatEfficiency); | ||
|
||
var energyReleased = heatEfficiency * Atmospherics.NitriumDecompositionEnergy; | ||
|
||
var newHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture); | ||
if (newHeatCapacity > Atmospherics.MinimumHeatCapacity) | ||
mixture.Temperature = Math.Max((mixture.Temperature * oldHeatCapacity + energyReleased) / newHeatCapacity, Atmospherics.TCMB); | ||
|
||
return ReactionResult.Reacting; | ||
} | ||
} |
Oops, something went wrong.