Some more small optimizations

Simple-Station · Jul 1, 2024 · 35eb6f6 · 35eb6f6
1 parent c8e0572
commit 35eb6f6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/Content.Server/Psionics/Abilities/DispelPowerSystem.cs b/Content.Server/Psionics/Abilities/DispelPowerSystem.cs
@@ -84,7 +84,11 @@ private void OnPowerUsed(DispelPowerActionEvent args)
             {
                 args.Handled = true;
                 _psionics.LogPowerUsed(args.Performer, "dispel", psionic, 1, 1, true);
-                _glimmerSystem.DeltaGlimmerInput(-_random.NextFloat(2 * psionic.Dampening - psionic.Amplification, 4 * psionic.Dampening - psionic.Amplification));
+
+                // Redundant check here as well for a small performance optimization
+                // Dispel has its own niche equations for glimmer.
+                if (_glimmerSystem.GetGlimmerEnabled())
+                    _glimmerSystem.DeltaGlimmerOutput(-_random.NextFloat(2 * psionic.Dampening - psionic.Amplification, 4 * psionic.Dampening - psionic.Amplification));
             }
         }
 

diff --git a/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs b/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
@@ -160,6 +160,14 @@ public float GetGlimmerEquilibriumRatio()
                 return 0.01f;
             else return GlimmerOutput / GlimmerEquilibrium;
         }
+
+        /// <summary>
+        ///     Returns the GlimmerEnabled CVar, useful for niche early exits in systems that otherwise don't have any calls to CVars.
+        /// </summary>
+        public bool GetGlimmerEnabled()
+        {
+            return _enabled;
+        }
     }
 
     [Serializable, NetSerializable]

diff --git a/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs b/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
@@ -88,7 +88,8 @@ public void LogPowerUsed(EntityUid uid, string power, PsionicComponent? psionic
             var ev = new PsionicPowerUsedEvent(uid, power);
             RaiseLocalEvent(uid, ev, false);
 
-            if (!overrideGlimmer)
+            //Redundant check for the GlimmerEnabled CVar because I want to skip this math too if its turned off.
+            if (_glimmerSystem.GetGlimmerEnabled() && !overrideGlimmer)
             {
                 if (psionic == null)
                     _glimmerSystem.DeltaGlimmerInput(_robustRandom.NextFloat(minGlimmer, maxGlimmer));