[Feature] TG Gases / TG Газы (#147)

* 237.2.0 * feat: /tg/ gases * Revert "237.2.0" This reverts commit 08ecd6b. * fix: sound * Revert "237.2.0" This reverts commit 08ecd6b. * tweak: AI rewie * fix: tupo * Revert "237.2.0" This reverts commit 08ecd6b. * fix: tupo
WWhiteDreamProject · Dec 17, 2024 · 7c4bf63 · 7c4bf63
1 parent d074d32
commit 7c4bf63
Show file tree

Hide file tree

Showing 55 changed files with 2,606 additions and 149 deletions.
diff --git a/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs b/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
@@ -42,6 +42,19 @@ public sealed partial class AtmosAlarmEntryContainer : BoxContainer
         [Gas.Plasma] = "P",
         [Gas.Tritium] = "T",
         [Gas.WaterVapor] = "H₂O",
+        // WD EDIT START
+        [Gas.BZ] = "BZ",
+        [Gas.Pluoxium] = "TCO₃",
+        [Gas.Hydrogen] = "H₂",
+        [Gas.Nitrium] = "NT₂",
+        [Gas.Healium] = "FBZ",
+        [Gas.HyperNoblium] = "TN₂",
+        [Gas.ProtoNitrate] = "HTCO₃",
+        [Gas.Zauker] = "(NT)₃",
+        [Gas.Halon] = "Ha",
+        [Gas.Helium] = "He",
+        [Gas.AntiNoblium] = "AN",
+        // WD EDIT END
     };
 
     public AtmosAlarmEntryContainer(NetEntity uid, EntityCoordinates? coordinates)
@@ -212,4 +225,4 @@ private Color GetAlarmStateColor(AtmosAlarmType alarmType)
 
         return StyleNano.DisabledFore;
     }
-}
+}
diff --git a/Content.Client/Atmos/Overlays/GasTileOverlay.cs b/Content.Client/Atmos/Overlays/GasTileOverlay.cs
@@ -111,7 +111,7 @@ protected override void FrameUpdate(FrameEventArgs args)
             for (var i = 0; i < _gasCount; i++)
             {
                 var delays = _frameDelays[i];
-                if (delays.Length == 0)
+                if (delays == null || delays.Length == 0) // WD EDIT
                     continue;
 
                 var frameCount = _frameCounter[i];

diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs
@@ -44,7 +44,8 @@ private void ProcessHotspot(
                 ExcitedGroupResetCooldowns(tile.ExcitedGroup);
 
             if ((tile.Hotspot.Temperature < Atmospherics.FireMinimumTemperatureToExist) || (tile.Hotspot.Volume <= 1f)
-                || tile.Air == null || tile.Air.GetMoles(Gas.Oxygen) < 0.5f || (tile.Air.GetMoles(Gas.Plasma) < 0.5f && tile.Air.GetMoles(Gas.Tritium) < 0.5f))
+                || tile.Air == null || tile.Air.GetMoles(Gas.Oxygen) < 0.5f || (tile.Air.GetMoles(Gas.Plasma) < 0.5f && tile.Air.GetMoles(Gas.Tritium) < 0.5f
+                    && tile.Air.GetMoles(Gas.Hydrogen) < 0.5f && tile.Air.GetMoles(Gas.HyperNoblium) > 5f)) // WD EDIT
             {
                 tile.Hotspot = new Hotspot();
                 InvalidateVisuals(ent, tile);
@@ -109,40 +110,51 @@ private void HotspotExpose(GridAtmosphereComponent gridAtmosphere, TileAtmospher
 
             var plasma = tile.Air.GetMoles(Gas.Plasma);
             var tritium = tile.Air.GetMoles(Gas.Tritium);
+            var hydrogen = tile.Air.GetMoles(Gas.Hydrogen); // WD EDIT
+            var hypernoblium = tile.Air.GetMoles(Gas.HyperNoblium); // WD EDIT
 
             if (tile.Hotspot.Valid)
             {
-                if (soh)
-                {
-                    if (plasma > 0.5f || tritium > 0.5f)
-                    {
-                        if (tile.Hotspot.Temperature < exposedTemperature)
-                            tile.Hotspot.Temperature = exposedTemperature;
-                        if (tile.Hotspot.Volume < exposedVolume)
-                            tile.Hotspot.Volume = exposedVolume;
-                    }
-                }
+                // WD EDIT START
+                if (!soh)
+                    return;
+
+                if ((!(plasma > 0.5f) || !(hypernoblium < 5f))
+                    && (!(tritium > 0.5f) || !(hypernoblium < 5f))
+                    && (!(hydrogen > 0.5f) || !(hypernoblium < 5f)))
+                    return;
+
+                if (tile.Hotspot.Temperature < exposedTemperature)
+                    tile.Hotspot.Temperature = exposedTemperature;
+                if (tile.Hotspot.Volume < exposedVolume)
+                    tile.Hotspot.Volume = exposedVolume;
+                // WD EDIT END
 
                 return;
             }
 
-            if ((exposedTemperature > Atmospherics.PlasmaMinimumBurnTemperature) && (plasma > 0.5f || tritium > 0.5f))
+            // WD EDIT START
+            if (!(exposedTemperature > Atmospherics.PlasmaMinimumBurnTemperature)
+                || (!(plasma > 0.5f) || !(hypernoblium < 5f))
+                    && (!(tritium > 0.5f) || !(hypernoblium < 5f))
+                    && (!(hydrogen > 0.5f) || !(hypernoblium < 5f)))
+                return;
+            // WD EDIT END
+
+            if (sparkSourceUid.HasValue)
+                _adminLog.Add(LogType.Flammable, LogImpact.High, $"Heat/spark of {ToPrettyString(sparkSourceUid.Value)} caused atmos ignition of gas: {tile.Air.Temperature.ToString():temperature}K - {oxygen}mol Oxygen, {plasma}mol Plasma, {tritium}mol Tritium, {hydrogen}mol Hydrogen");
+
+            tile.Hotspot = new Hotspot
             {
-                if (sparkSourceUid.HasValue)
-                    _adminLog.Add(LogType.Flammable, LogImpact.High, $"Heat/spark of {ToPrettyString(sparkSourceUid.Value)} caused atmos ignition of gas: {tile.Air.Temperature.ToString():temperature}K - {oxygen}mol Oxygen, {plasma}mol Plasma, {tritium}mol Tritium");
+                Volume = exposedVolume * 25f,
+                Temperature = exposedTemperature,
+                SkippedFirstProcess = tile.CurrentCycle > gridAtmosphere.UpdateCounter,
+                Valid = true,
+                State = 1
+            };
 
-                tile.Hotspot = new Hotspot
-                {
-                    Volume = exposedVolume * 25f,
-                    Temperature = exposedTemperature,
-                    SkippedFirstProcess = tile.CurrentCycle > gridAtmosphere.UpdateCounter,
-                    Valid = true,
-                    State = 1
-                };
-
-                AddActiveTile(gridAtmosphere, tile);
-                gridAtmosphere.HotspotTiles.Add(tile);
-            }
+            AddActiveTile(gridAtmosphere, tile);
+            gridAtmosphere.HotspotTiles.Add(tile);
         }
 
         private void PerformHotspotExposure(TileAtmosphere tile)

diff --git a/Content.Server/Atmos/Portable/PortableScrubberComponent.cs b/Content.Server/Atmos/Portable/PortableScrubberComponent.cs
@@ -30,7 +30,18 @@ public sealed partial class PortableScrubberComponent : Component
             Gas.WaterVapor,
             Gas.Ammonia,
             Gas.NitrousOxide,
-            Gas.Frezon
+            Gas.Frezon,
+            Gas.BZ,
+            Gas.Pluoxium,
+            Gas.Hydrogen,
+            Gas.Nitrium,
+            Gas.Healium,
+            Gas.HyperNoblium,
+            Gas.ProtoNitrate,
+            Gas.Zauker,
+            Gas.Halon,
+            Gas.Helium,
+            Gas.AntiNoblium
         };
 
         [ViewVariables(VVAccess.ReadWrite)]

diff --git a/Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs b/Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs
@@ -14,6 +14,13 @@ public sealed partial class FrezonCoolantReaction : IGasReactionEffect
     public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem, float heatScale)
     {
         var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture, true);
+
+        // WD EDIT START
+        var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium);
+        if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f)
+            return ReactionResult.NoReaction;
+        // WD EDIT END
+
         var temperature = mixture.Temperature;
 
         var energyModifier = 1f;

diff --git a/Content.Server/Atmos/Reactions/FrezonProductionReaction.cs b/Content.Server/Atmos/Reactions/FrezonProductionReaction.cs
@@ -14,6 +14,12 @@ public sealed partial class FrezonProductionReaction : IGasReactionEffect
 {
     public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem, float heatScale)
     {
+        // WD EDIT START
+        var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium);
+        if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f)
+            return ReactionResult.NoReaction;
+        // WD EDIT END
+
         var initialN2 = mixture.GetMoles(Gas.Nitrogen);
         var initialOxy = mixture.GetMoles(Gas.Oxygen);
         var initialTrit = mixture.GetMoles(Gas.Tritium);

diff --git a/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs b/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs
@@ -11,6 +11,12 @@ public sealed partial class PlasmaFireReaction : IGasReactionEffect
     {
         public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem, float heatScale)
         {
+            // WD EDIT START
+            var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium);
+            if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f)
+                return ReactionResult.NoReaction;
+            // WD EDIT END
+
             var energyReleased = 0f;
             var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture, true);
             var temperature = mixture.Temperature;

diff --git a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs b/Content.Server/Atmos/Reactions/TritiumFireReaction.cs
@@ -11,6 +11,12 @@ public sealed partial class TritiumFireReaction : IGasReactionEffect
     {
         public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem, float heatScale)
         {
+            // WD EDIT START
+            var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium);
+            if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f)
+                return ReactionResult.NoReaction;
+            // WD EDIT END
+
             var energyReleased = 0f;
             var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture, true);
             var temperature = mixture.Temperature;

diff --git a/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs b/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs
@@ -13,7 +13,12 @@ public sealed partial class GasLeakRuleComponent : Component
         Gas.Plasma,
         Gas.Tritium,
         Gas.Frezon,
-        Gas.WaterVapor, // the fog
+        Gas.WaterVapor,
+        // WD EDIT START
+        Gas.BZ,
+        Gas.Hydrogen,
+        Gas.Halon,
+        // WD EDIT END
     };
 
     /// <summary>

diff --git a/Content.Server/_White/Atmos/Reactions/BZProductionReaction.cs b/Content.Server/_White/Atmos/Reactions/BZProductionReaction.cs
@@ -0,0 +1,52 @@
+using Content.Server.Atmos;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Reactions;
+using JetBrains.Annotations;
+
+namespace Content.Server._White.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)
+            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;
+    }
+}
diff --git a/Content.Server/_White/Atmos/Reactions/HalonOxygenAbsorptionReaction.cs b/Content.Server/_White/Atmos/Reactions/HalonOxygenAbsorptionReaction.cs
@@ -0,0 +1,40 @@
+using Content.Server.Atmos;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Reactions;
+using JetBrains.Annotations;
+
+namespace Content.Server._White.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);
+
+        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;
+    }
+}
diff --git a/Content.Server/_White/Atmos/Reactions/HealiumProductionReaction.cs b/Content.Server/_White/Atmos/Reactions/HealiumProductionReaction.cs
@@ -0,0 +1,41 @@
+using Content.Server.Atmos;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Reactions;
+using JetBrains.Annotations;
+
+namespace Content.Server._White.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;
+    }
+}