From c8e0572c675b51d78681637c89de8b4c7d3c5a9f Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 1 Jul 2024 19:22:48 -0400 Subject: [PATCH] simplify GlimmerEquilibrium constant --- .../Psionics/Abilities/PyrokinesisPowerSystem.cs | 2 +- .../Glimmer/Structures/GlimmerStructuresSystem.cs | 2 +- Content.Shared/Psionics/Glimmer/GlimmerSystem.cs | 9 +-------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs index 07ada4c0c5d..f3e2cc69fd5 100644 --- 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 index b8649f71a5f..309bd732ef7 100644 --- 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 index f40a916f487..b376f8aab79 100644 --- a/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs +++ b/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs @@ -30,15 +30,8 @@ public float GlimmerInput /// /// This constant is equal to the intersection of the Glimmer Equation(https://www.desmos.com/calculator/posutiq38e) and the line Y = X. /// - private const float _glimmerEquilibrium = 502.941f; + public const float GlimmerEquilibrium = 502.941f; - /// - /// This constant is equal to the intersection of the Glimmer Equation(https://www.desmos.com/calculator/posutiq38e) and the line Y = X. - /// - public float GlimmerEquilibrium - { - get { return _glimmerEquilibrium; } - } /// /// 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