[port] TGgases Try 2 #1008
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
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
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,51 @@ | ||
| using Content.Server.Atmos.EntitySystems; | ||
| using Content.Shared.Atmos; | ||
| using Content.Shared.Atmos.Reactions; | ||
| using JetBrains.Annotations; | ||
|
|
||
| namespace Content.Server.Atmos.Reactions; | ||
|
|
||
| [UsedImplicitly] | ||
| public sealed partial class BZProductionReaction : IGasReactionEffect | ||
| { | ||
| public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem, float heatScale) | ||
| { | ||
| 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) | ||
|
There was a problem hiding this comment. Проверьте правильность математического выражения. В условии |
||
| return ReactionResult.NoReaction; | ||
|
|
||
| var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture, true); | ||
|
|
||
| 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, true); | ||
| 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,39 @@ | ||
| using Content.Server.Atmos.EntitySystems; | ||
| using Content.Shared.Atmos; | ||
| using Content.Shared.Atmos.Reactions; | ||
| using JetBrains.Annotations; | ||
|
|
||
| namespace Content.Server.Atmos.Reactions; | ||
|
|
||
| [UsedImplicitly] | ||
| public sealed partial class HalonOxygenAbsorptionReaction : IGasReactionEffect | ||
| { | ||
| public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem, float heatScale) | ||
| { | ||
| 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, true); | ||
|
|
||
| mixture.AdjustMoles(Gas.Halon, -heatEfficiency); | ||
| mixture.AdjustMoles(Gas.Oxygen, -heatEfficiency * 20f); | ||
| mixture.AdjustMoles(Gas.CarbonDioxide, heatEfficiency * 5f); | ||
|
Comment on lines
+28
to
+30
There was a problem hiding this comment. 💡 Codebase verification Рекомендуется пересмотреть молярные соотношения Анализ кодовой базы показывает, что соотношение 1:20 между Halon и Oxygen значительно выше, чем в других атмосферных реакциях. Большинство реакций используют множители в диапазоне от 0.01 до 5.0. Рекомендуется:
🔗 Analysis chainПроверить большую разницу в молярных соотношениях Соотношение 1:20 между Halon и Oxygen кажется очень большим. Убедитесь, что это соответствует желаемому балансу игры. 🏁 Scripts executedThe following scripts were executed for the analysis: Script: #!/bin/bash
# Поиск других реакций с похожими соотношениями
rg "AdjustMoles.*20f" -g "*.cs"
Length of output: 169 Script: #!/bin/bash
# Search for other atmospheric reactions
echo "=== Searching for other reaction files ==="
fd "Reaction.cs" --exec grep -l "AdjustMoles"
echo -e "\n=== Searching for documentation about Halon ==="
rg "Halon" -g "*.md" -g "*.txt"
echo -e "\n=== Looking for other molar adjustments ==="
rg "AdjustMoles.*\d+f" -g "*.cs"
Length of output: 6107 |
||
|
|
||
| var energyUsed = heatEfficiency * Atmospherics.HalonCombustionEnergy; | ||
| var newHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture, true); | ||
| if (newHeatCapacity > Atmospherics.MinimumHeatCapacity) | ||
| mixture.Temperature = Math.Max((mixture.Temperature * oldHeatCapacity + energyUsed) / 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,40 @@ | ||
| using Content.Server.Atmos.EntitySystems; | ||
| using Content.Shared.Atmos; | ||
| using Content.Shared.Atmos.Reactions; | ||
| using JetBrains.Annotations; | ||
|
|
||
| namespace Content.Server.Atmos.Reactions; | ||
|
|
||
| [UsedImplicitly] | ||
| public sealed partial class HealiumProductionReaction : IGasReactionEffect | ||
| { | ||
| public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem, float heatScale) | ||
| { | ||
| 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, true); | ||
|
|
||
| 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, true); | ||
| 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,59 @@ | ||
| using Content.Server.Atmos.EntitySystems; | ||
| using Content.Shared.Atmos; | ||
| using Content.Shared.Atmos.Reactions; | ||
| using JetBrains.Annotations; | ||
|
|
||
| namespace Content.Server.Atmos.Reactions | ||
| { | ||
| [UsedImplicitly] | ||
| [DataDefinition] | ||
| public sealed partial class HydrogenFireReaction : IGasReactionEffect | ||
| { | ||
| public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem, float heatScale) | ||
| { | ||
| var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); | ||
| if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) | ||
|
There was a problem hiding this comment. Проверьте единицы измерения температуры. В строке 15 сравнивается |
||
| return ReactionResult.NoReaction; | ||
|
|
||
| var energyReleased = 0f; | ||
| var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture, true); | ||
| 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, true); | ||
| 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; | ||
| } | ||
| } | ||
| } | ||
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,41 @@ | ||
| using Content.Server.Atmos.EntitySystems; | ||
| using Content.Shared.Atmos; | ||
| using Content.Shared.Atmos.Reactions; | ||
| using JetBrains.Annotations; | ||
|
|
||
| namespace Content.Server.Atmos.Reactions; | ||
|
|
||
| [UsedImplicitly] | ||
| public sealed partial class HyperNobliumProductionReaction : IGasReactionEffect | ||
| { | ||
| public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem, float heatScale) | ||
| { | ||
| 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, true); | ||
|
|
||
| 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, true); | ||
| if (newHeatCapacity > Atmospherics.MinimumHeatCapacity) | ||
| mixture.Temperature = Math.Max((mixture.Temperature * oldHeatCapacity + energyReleased) / newHeatCapacity, Atmospherics.TCMB); | ||
Roudenn marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| return ReactionResult.Reacting; | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Проверьте единицы измерения температуры.
В строке 14 используется условие
mixture.Temperature > 20f. Если температура хранится в Кельвинах, сравнение с 20 может быть некорректным. Убедитесь, что сравнение проводится в правильных единицах температуры.