From 682ae5b1ba93b3e2db884b5ec17c578cbf5b05a3 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 31 Aug 2022 22:43:19 +1000 Subject: [PATCH] Fix damage overlay rounding (#10792) --- .../MobState/Overlays/DamageOverlay.cs | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/Content.Client/MobState/Overlays/DamageOverlay.cs b/Content.Client/MobState/Overlays/DamageOverlay.cs index 70fc218407..cd1d1df237 100644 --- a/Content.Client/MobState/Overlays/DamageOverlay.cs +++ b/Content.Client/MobState/Overlays/DamageOverlay.cs @@ -73,29 +73,45 @@ public sealed class DamageOverlay : Overlay { DeadLevel = 1f; } - else if (!DeadLevel.Equals(0f)) + else if (!MathHelper.CloseTo(0f, DeadLevel, 0.001f)) { var diff = -DeadLevel; DeadLevel += GetDiff(diff, lastFrameTime); } + else + { + DeadLevel = 0f; + } if (!MathHelper.CloseTo(_oldBruteLevel, BruteLevel, 0.001f)) { var diff = BruteLevel - _oldBruteLevel; _oldBruteLevel += GetDiff(diff, lastFrameTime); } + else + { + _oldBruteLevel = BruteLevel; + } if (!MathHelper.CloseTo(_oldOxygenLevel, OxygenLevel, 0.001f)) { var diff = OxygenLevel - _oldOxygenLevel; _oldOxygenLevel += GetDiff(diff, lastFrameTime); } + else + { + _oldOxygenLevel = OxygenLevel; + } if (!MathHelper.CloseTo(_oldCritLevel, CritLevel, 0.001f)) { var diff = CritLevel - _oldCritLevel; _oldCritLevel += GetDiff(diff, lastFrameTime); } + else + { + _oldCritLevel = CritLevel; + } /* * darknessAlphaOuter is the maximum alpha for anything outside of the larger circle