From 2650c4806c50ee78c70e17987a3de6ac968906c2 Mon Sep 17 00:00:00 2001
From: evanpelle <evanpelle@gmail.com>
Date: Wed, 28 May 2025 15:38:51 -0700
Subject: [PATCH] fix alternate view regression (#937)

## Description:
when pressing space for alternate view, the ships did not change color.
This was cased by incorrect sprite caching.

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [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:

<DISCORD USERNAME>
---
 src/client/graphics/SpriteLoader.ts     |  2 +-
 src/client/graphics/layers/UnitLayer.ts | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/client/graphics/SpriteLoader.ts b/src/client/graphics/SpriteLoader.ts
index 7fb1ab852..4bc552bc1 100644
--- a/src/client/graphics/SpriteLoader.ts
+++ b/src/client/graphics/SpriteLoader.ts
@@ -128,7 +128,7 @@ export const getColoredSprite = (
   const territoryColor = customTerritoryColor ?? theme.territoryColor(owner);
   const borderColor = customBorderColor ?? theme.borderColor(owner);
   const spawnHighlightColor = theme.spawnHighlightColor();
-  const key = `${unit.type()}-${owner.id()}`;
+  const key = `${unit.type()}-${owner.id()}-${customTerritoryColor}-${customBorderColor}`;
 
   if (coloredSpriteCache.has(key)) {
     return coloredSpriteCache.get(key)!;
diff --git a/src/client/graphics/layers/UnitLayer.ts b/src/client/graphics/layers/UnitLayer.ts
index 5ec98850c..8501610f8 100644
--- a/src/client/graphics/layers/UnitLayer.ts
+++ b/src/client/graphics/layers/UnitLayer.ts
@@ -4,7 +4,6 @@ import { ClientID } from "../../../core/Schemas";
 import { Theme } from "../../../core/configuration/Config";
 import { UnitType } from "../../../core/game/Game";
 import { TileRef } from "../../../core/game/GameMap";
-import { GameUpdateType } from "../../../core/game/GameUpdates";
 import { GameView, PlayerView, UnitView } from "../../../core/game/GameView";
 import { BezenhamLine } from "../../../core/utilities/Line";
 import {
@@ -16,6 +15,7 @@ import { MoveWarshipIntentEvent } from "../../Transport";
 import { TransformHandler } from "../TransformHandler";
 import { Layer } from "./Layer";
 
+import { GameUpdateType } from "../../../core/game/GameUpdates";
 import {
   getColoredSprite,
   isSpriteReady,
@@ -70,8 +70,11 @@ export class UnitLayer implements Layer {
     if (this.myPlayer === null) {
       this.myPlayer = this.game.playerByClientID(this.clientID);
     }
+    const unitIds = this.game
+      .updatesSinceLastTick()
+      ?.[GameUpdateType.Unit]?.map((unit) => unit.id);
 
-    this.updateUnitsSprites();
+    this.updateUnitsSprites(unitIds ?? []);
   }
 
   init() {
@@ -202,7 +205,7 @@ export class UnitLayer implements Layer {
     this.transportShipTrailCanvas.width = this.game.width();
     this.transportShipTrailCanvas.height = this.game.height();
 
-    this.updateUnitsSprites();
+    this.updateUnitsSprites(this.game.units().map((unit) => unit.id()));
 
     this.unitToTrail.forEach((trail, unit) => {
       for (const t of trail) {
@@ -218,10 +221,9 @@ export class UnitLayer implements Layer {
     });
   }
 
-  private updateUnitsSprites() {
-    const unitsToUpdate = this.game
-      .updatesSinceLastTick()
-      ?.[GameUpdateType.Unit]?.map((unit) => this.game.unit(unit.id))
+  private updateUnitsSprites(unitIds: number[]) {
+    const unitsToUpdate = unitIds
+      ?.map((id) => this.game.unit(id))
       .filter((unit) => unit !== undefined);
 
     if (unitsToUpdate) {