Fixes

Rxup · Jan 22, 2025 · b90b0cf · b90b0cf
1 parent 2fdd985
commit b90b0cf
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/Content.Server/Backmen/Atmos/Reactions/HalonFrezonDecompositionReaction.cs b/Content.Server/Backmen/Atmos/Reactions/HalonFrezonDecompositionReaction.cs
@@ -22,9 +22,10 @@ public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, Atmos
 
         var producedAmount = Math.Min(ratioEfficiency * environmentEfficiency * 2f, Math.Min(initialFrezon * 0.5f, initialHalon * 0.5f));
 
-        if (producedAmount <= 0 || initialHalon - producedAmount * 0.5f < 0 || initialFrezon - producedAmount * 0.5f < 0 || initialHalon > initialFrezon + initialHalon)
+        if (producedAmount <= 0 || initialHalon - producedAmount * 0.5f < 0 || initialFrezon - producedAmount * 0.5f < 0)
             return ReactionResult.NoReaction;
 
+        var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture, true);
         mixture.AdjustMoles(Gas.Halon, -producedAmount * 0.5f);
         mixture.AdjustMoles(Gas.Frezon, -producedAmount * 0.5f);
         mixture.AdjustMoles(Gas.Helium, producedAmount * 1f);
@@ -33,7 +34,6 @@ public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, Atmos
 
         var energyReleased = producedAmount * Atmospherics.HalonFrezonDecompositionEnergy;
 
-        var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture, true);
         var newHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture, true);
         if (newHeatCapacity > Atmospherics.MinimumHeatCapacity)
             mixture.Temperature = Math.Max((mixture.Temperature * oldHeatCapacity + energyReleased) / newHeatCapacity, Atmospherics.TCMB);

diff --git a/Content.Server/Backmen/Atmos/Reactions/HalonProductionReaction.cs b/Content.Server/Backmen/Atmos/Reactions/HalonProductionReaction.cs
@@ -23,13 +23,13 @@ public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, Atmos
         if (producedAmount <= 0 || initialBZ - producedAmount * 0.2f < 0 || initialTritium - producedAmount * 0.5f < 0 || initialBZ > initialTritium + initialHalon)
             return ReactionResult.NoReaction;
 
+        var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture, true);
+
         mixture.AdjustMoles(Gas.BZ, -producedAmount * 0.2f);
         mixture.AdjustMoles(Gas.Tritium, -producedAmount * 0.5f);
         mixture.AdjustMoles(Gas.Halon, producedAmount * 0.4f);
 
         var energyReleased = producedAmount * Atmospherics.HalonFormationEnergy;
-
-        var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture, true);
         var newHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture, true);
         if (newHeatCapacity > Atmospherics.MinimumHeatCapacity)
             mixture.Temperature = Math.Max((mixture.Temperature * oldHeatCapacity + energyReleased) / newHeatCapacity, Atmospherics.TCMB);

diff --git a/Content.Server/Backmen/Atmos/Reactions/PluoxiumProductionReaction.cs b/Content.Server/Backmen/Atmos/Reactions/PluoxiumProductionReaction.cs
@@ -20,7 +20,7 @@ public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, Atmos
 
         var producedAmount = Math.Min(Atmospherics.PluoxiumMaxRate, Math.Min(initialCarbonDioxide, Math.Min(initialOxygen * 0.5f, initialTritium * Atmospherics.PluoxiumTritiumConversion)));
 
-        if (producedAmount <= 0 || initialCarbonDioxide - producedAmount < 0 || initialOxygen - producedAmount * 0.5f < 0 || initialTritium - producedAmount * 0.01f < 0)
+        if (producedAmount <= 0 || initialCarbonDioxide - producedAmount < 0 || initialOxygen - producedAmount * 0.5f < 0 || initialTritium - producedAmount * Atmospherics.PluoxiumTritiumConversion < 0)
             return ReactionResult.NoReaction;
 
         mixture.AdjustMoles(Gas.CarbonDioxide, -producedAmount);

diff --git a/Resources/Prototypes/_Backmen/Atmospherics/reactions.yml b/Resources/Prototypes/_Backmen/Atmospherics/reactions.yml
@@ -62,10 +62,10 @@
   minimumTemperature: 1000
   minimumRequirements:
   - 0     # oxygen
-  - 0.02  # nitrogen
+  - 0.01  # nitrogen
   - 0     # carbon dioxide
   - 0     # plasma
-  - 0.02  # tritium
+  - 0.01  # tritium
   - 0     # vapor
   - 0     # miasma
   - 0     # n2o
@@ -119,10 +119,10 @@
   maximumTemperature: 24.15 # Reachable with Frezon and Nitrogen
   minimumRequirements:
   - 0     # oxygen
-  - 0.10  # nitrogen
+  - 0.01  # nitrogen
   - 0     # carbon dioxide
   - 0     # plasma
-  - 0.05  # tritium
+  - 0.01  # tritium
   - 0     # vapor
   - 0     # miasma
   - 0     # n2o
@@ -229,7 +229,7 @@
 
 - type: gasReaction
   id: HalonFrezonDecomposition
-  priority: 9
+  priority: 10
   minimumRequirements:
   - 0     # oxygen
   - 0     # nitrogen
@@ -256,7 +256,7 @@
 
 - type: gasReaction
   id: ZaukerProduction
-  priority: 9
+  priority: 11
   minimumTemperature: 50000
   maximumTemperature: 75000
   minimumRequirements:
@@ -285,7 +285,7 @@
 
 - type: gasReaction
   id: ZaukerDecomposition
-  priority: 10
+  priority: 12
   minimumRequirements:
   - 0     # oxygen
   - 0.01  # nitrogen
@@ -312,7 +312,7 @@
 
 - type: gasReaction
   id: ProtoNitrateProduction
-  priority: 11
+  priority: 13
   minimumTemperature: 5000
   maximumTemperature: 10000
   minimumRequirements:
@@ -341,7 +341,7 @@
 
 - type: gasReaction
   id: ProtoNitrateHydrogenConversion
-  priority: 12
+  priority: 14
   minimumRequirements:
   - 0     # oxygen
   - 0     # nitrogen
@@ -368,7 +368,7 @@
 
 - type: gasReaction
   id: ProtoNitrateTritiumDeirradiation
-  priority: 13
+  priority: 15
   minimumTemperature: 150
   maximumTemperature: 340
   minimumRequirements:
@@ -397,7 +397,7 @@
 
 - type: gasReaction
   id: ProtoNitrateBZaseAction
-  priority: 14
+  priority: 16
   minimumTemperature: 260
   maximumTemperature: 280
   minimumRequirements: