From 814e4d9934a422848e0475ab8919440a16cb1ba6 Mon Sep 17 00:00:00 2001
From: Vivacious Box <jon@rouillard.org>
Date: Thu, 12 Jun 2025 00:24:58 +0300
Subject: [PATCH] Fix regression cooldown bars (#1154)

## Description:

Changes in unit cooldown introduced a bug in the loading bars
This fixes it.

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I process any text displayed to the user through translateText()
and I've added it to the en.json file
- [x] I have added relevant tests to the test directory
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

Vivacious Box
---
 src/client/graphics/layers/UILayer.ts | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/client/graphics/layers/UILayer.ts b/src/client/graphics/layers/UILayer.ts
index c9fa49933..0818b1964 100644
--- a/src/client/graphics/layers/UILayer.ts
+++ b/src/client/graphics/layers/UILayer.ts
@@ -126,10 +126,23 @@ export class UILayer implements Layer {
         this.drawHealthBar(unit);
         break;
       }
-      case UnitType.SAMLauncher:
       case UnitType.MissileSilo:
-        if (unit.isActive() && unit.isInCooldown()) {
-          const endTick = unit.ticksLeftInCooldown() || 0;
+        if (
+          unit.isActive() &&
+          unit.isInCooldown() &&
+          !this.allProgressBars.has(unit.id())
+        ) {
+          const endTick = this.game.config().SiloCooldown();
+          this.drawLoadingBar(unit, endTick);
+        }
+        break;
+      case UnitType.SAMLauncher:
+        if (
+          unit.isActive() &&
+          unit.isInCooldown() &&
+          !this.allProgressBars.has(unit.id())
+        ) {
+          const endTick = this.game.config().SAMCooldown();
           this.drawLoadingBar(unit, endTick);
         }
         break;