Release 1.9.7.0 - Summer Update 2025

2025-06-17 16:38:11 +03:00
parent 22227f13e5
commit ea5a2bc693
297 changed files with 7344 additions and 2421 deletions
@@ -236,7 +236,11 @@ namespace Barotrauma.Items.Components

        public ItemComponent GetReplacementOrThis()
        {
-            return ReplacedBy?.GetReplacementOrThis() ?? this;
+            if (ReplacedBy != null && ReplacedBy != this)
+            {
+                return ReplacedBy.GetReplacementOrThis();
+            }
+            return this;
        }

        public bool NeedsSoundUpdate()
@@ -511,7 +515,7 @@ namespace Barotrauma.Items.Components
                if (HUDOverlay is SpriteSheet spriteSheet)
                {
                    spriteSheet.Draw(spriteBatch,
-                        spriteIndex: (int)(Math.Floor(Timing.TotalTimeUnpaused * HUDOverlayAnimSpeed) % spriteSheet.FrameCount),
+                        spriteIndex: spriteSheet.GetAnimatedSpriteIndex(HUDOverlayAnimSpeed),
                        pos: screenSize / 2, color: Color.White, origin: HUDOverlay.Origin, rotate: 0, scale: screenSize / spriteSheet.FrameSize.ToVector2());
                }
                else