simplify GlimmerEquilibrium constant

Simple-Station · Jul 1, 2024 · c8e0572 · c8e0572
1 parent 8bbcafa
commit c8e0572
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs
@@ -118,7 +118,7 @@ private void OnPowerUsed(PyrokinesisPowerActionEvent args)
                     fireball.IntensitySlope = 1 * psionicFactor;
                     fireball.TotalIntensity = 25 * psionicFactor;
 
-                    if (_glimmerSystem.GlimmerOutput >= _glimmerSystem.GlimmerEquilibrium)
+                    if (_glimmerSystem.GlimmerOutput >= GlimmerSystem.GlimmerEquilibrium)
                         fireball.CanCreateVacuum = true;
                     else fireball.CanCreateVacuum = false;
 

diff --git a/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs b/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
@@ -76,7 +76,7 @@ public override void Update(float frameTime)
 
                 if (source.Accumulator > source.SecondsPerGlimmer)
                 {
-                    var glimmerEquilibrium = _glimmerSystem.GlimmerEquilibrium;
+                    var glimmerEquilibrium = GlimmerSystem.GlimmerEquilibrium;
                     source.Accumulator -= source.SecondsPerGlimmer;
 
                     // Shorthand explanation:

diff --git a/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs b/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
@@ -30,15 +30,8 @@ public float GlimmerInput
         /// <summary>
         ///     This constant is equal to the intersection of the Glimmer Equation(https://www.desmos.com/calculator/posutiq38e) and the line Y = X.
         /// </summary>
-        private const float _glimmerEquilibrium = 502.941f;
+        public const float GlimmerEquilibrium = 502.941f;
 
-        /// <summary>
-        ///     This constant is equal to the intersection of the Glimmer Equation(https://www.desmos.com/calculator/posutiq38e) and the line Y = X.
-        /// </summary>
-        public float GlimmerEquilibrium
-        {
-            get { return _glimmerEquilibrium; }
-        }
 
         /// <summary>
         ///     Glimmer Output represents the player-facing value of the station's glimmer, and is given by f(x) for this graph: https://www.desmos.com/calculator/posutiq38e