From f3cbca059fb92acc6c570c9a6d35048b08b1bad8 Mon Sep 17 00:00:00 2001 From: babyboucher <48159308+babyboucher@users.noreply.github.com> Date: Wed, 8 Apr 2026 16:52:12 -0500 Subject: [PATCH] Remove dead color code (#3613) ## Description: Remove dead code relating to colors. ## 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 ## Please put your Discord username so you can be contacted if a bug or regression is found: DISCORD_USERNAME babyboucher --- src/client/Cosmetics.ts | 5 ----- src/client/Store.ts | 1 - src/client/TerritoryPatternsModal.ts | 1 - src/core/game/UserSettings.ts | 12 ------------ 4 files changed, 19 deletions(-) diff --git a/src/client/Cosmetics.ts b/src/client/Cosmetics.ts index 1e3f5387c..761953c55 100644 --- a/src/client/Cosmetics.ts +++ b/src/client/Cosmetics.ts @@ -240,7 +240,6 @@ export async function getPlayerCosmeticsRefs(): Promise { return { flag: flag ?? undefined, - color: userSettings.getSelectedColor() ?? undefined, patternName: pattern?.name ?? undefined, patternColorPaletteName: pattern?.colorPalette?.name ?? undefined, }; @@ -256,10 +255,6 @@ export async function getPlayerCosmetics(): Promise { result.flag = await resolveFlagUrl(refs.flag); } - if (refs.color) { - result.color = { color: refs.color }; - } - if (refs.patternName && cosmetics) { const pattern = cosmetics.patterns[refs.patternName]; diff --git a/src/client/Store.ts b/src/client/Store.ts index 2091a465e..574fff263 100644 --- a/src/client/Store.ts +++ b/src/client/Store.ts @@ -267,7 +267,6 @@ export class StoreModal extends BaseModal { private selectPattern(pattern: PlayerPattern | null) { this.selectedColor = null; - this.userSettings.setSelectedColor(undefined); if (pattern === null) { this.userSettings.setSelectedPatternName(undefined); } else { diff --git a/src/client/TerritoryPatternsModal.ts b/src/client/TerritoryPatternsModal.ts index 9e6537073..967ff40e6 100644 --- a/src/client/TerritoryPatternsModal.ts +++ b/src/client/TerritoryPatternsModal.ts @@ -215,7 +215,6 @@ export class TerritoryPatternsModal extends BaseModal { private selectPattern(pattern: PlayerPattern | null) { this.selectedColor = null; - this.userSettings.setSelectedColor(undefined); if (pattern === null) { this.userSettings.setSelectedPatternName(undefined); } else { diff --git a/src/core/game/UserSettings.ts b/src/core/game/UserSettings.ts index 33be61982..4728a9875 100644 --- a/src/core/game/UserSettings.ts +++ b/src/core/game/UserSettings.ts @@ -229,18 +229,6 @@ export class UserSettings { } } - getSelectedColor(): string | undefined { - return this.getCached(COLOR_KEY) ?? undefined; - } - - setSelectedColor(color: string | undefined): void { - if (color === undefined) { - this.removeCached(COLOR_KEY); - } else { - this.setCached(COLOR_KEY, color); - } - } - getFlag(): string | null { let flag = this.getCached(FLAG_KEY); if (!flag) return null;