From 902a0b42ac452c10a6f6e3627db80719004d9fa2 Mon Sep 17 00:00:00 2001
From: DevelopingTom <tom@rouillard.org>
Date: Sat, 7 Mar 2026 04:58:14 +0100
Subject: [PATCH] Remove useless sprite setting (#3363)

## Description:

Redundant animated sprite setting: the sprite frame width can be
computed directly.

## 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:

IngloriousTom
---
 src/client/graphics/AnimatedSprite.ts       | 14 +++++++++++---
 src/client/graphics/AnimatedSpriteLoader.ts | 17 +----------------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/client/graphics/AnimatedSprite.ts b/src/client/graphics/AnimatedSprite.ts
index 5fea319d7..66648951c 100644
--- a/src/client/graphics/AnimatedSprite.ts
+++ b/src/client/graphics/AnimatedSprite.ts
@@ -1,22 +1,30 @@
 export class AnimatedSprite {
   private frameHeight: number;
+  private frameWidth: number;
   private currentFrame: number = 0;
   private elapsedTime: number = 0;
   private active: boolean = true;
 
   constructor(
     private image: CanvasImageSource,
-    private frameWidth: number,
     private frameCount: number,
     private frameDuration: number, // in milliseconds
     private looping: boolean = false,
     private originX: number,
     private originY: number,
   ) {
-    if ("height" in image) {
+    if (frameCount <= 0) {
+      throw new Error("Animated sprite should at least have one frame");
+    }
+    if ("height" in image && "width" in image) {
       this.frameHeight = (image as HTMLImageElement | HTMLCanvasElement).height;
+      this.frameWidth = Math.floor(
+        (image as HTMLImageElement | HTMLCanvasElement).width / frameCount,
+      );
     } else {
-      throw new Error("Image source must have a 'height' property.");
+      throw new Error(
+        "Image source must have 'width' and 'height' properties.",
+      );
     }
   }
 
diff --git a/src/client/graphics/AnimatedSpriteLoader.ts b/src/client/graphics/AnimatedSpriteLoader.ts
index 03e49e0cc..b31678083 100644
--- a/src/client/graphics/AnimatedSpriteLoader.ts
+++ b/src/client/graphics/AnimatedSpriteLoader.ts
@@ -18,7 +18,6 @@ import { colorizeCanvas } from "./SpriteLoader";
 
 type AnimatedSpriteConfig = {
   url: string;
-  frameWidth: number;
   frameCount: number;
   frameDuration: number; // ms per frame
   looping?: boolean;
@@ -29,7 +28,6 @@ type AnimatedSpriteConfig = {
 const ANIMATED_SPRITE_CONFIG: Partial<Record<FxType, AnimatedSpriteConfig>> = {
   [FxType.MiniFire]: {
     url: miniFire,
-    frameWidth: 7,
     frameCount: 6,
     frameDuration: 100,
     looping: true,
@@ -38,7 +36,6 @@ const ANIMATED_SPRITE_CONFIG: Partial<Record<FxType, AnimatedSpriteConfig>> = {
   },
   [FxType.MiniSmoke]: {
     url: miniSmoke,
-    frameWidth: 11,
     frameCount: 4,
     frameDuration: 120,
     looping: true,
@@ -47,7 +44,6 @@ const ANIMATED_SPRITE_CONFIG: Partial<Record<FxType, AnimatedSpriteConfig>> = {
   },
   [FxType.MiniBigSmoke]: {
     url: miniBigSmoke,
-    frameWidth: 24,
     frameCount: 5,
     frameDuration: 120,
     looping: true,
@@ -56,8 +52,7 @@ const ANIMATED_SPRITE_CONFIG: Partial<Record<FxType, AnimatedSpriteConfig>> = {
   },
   [FxType.MiniSmokeAndFire]: {
     url: miniSmokeAndFire,
-    frameWidth: 24,
-    frameCount: 5,
+    frameCount: 6,
     frameDuration: 120,
     looping: true,
     originX: 9,
@@ -65,7 +60,6 @@ const ANIMATED_SPRITE_CONFIG: Partial<Record<FxType, AnimatedSpriteConfig>> = {
   },
   [FxType.MiniExplosion]: {
     url: miniExplosion,
-    frameWidth: 13,
     frameCount: 4,
     frameDuration: 70,
     looping: false,
@@ -74,7 +68,6 @@ const ANIMATED_SPRITE_CONFIG: Partial<Record<FxType, AnimatedSpriteConfig>> = {
   },
   [FxType.Dust]: {
     url: dust,
-    frameWidth: 9,
     frameCount: 3,
     frameDuration: 100,
     looping: false,
@@ -83,7 +76,6 @@ const ANIMATED_SPRITE_CONFIG: Partial<Record<FxType, AnimatedSpriteConfig>> = {
   },
   [FxType.UnitExplosion]: {
     url: unitExplosion,
-    frameWidth: 19,
     frameCount: 4,
     frameDuration: 70,
     looping: false,
@@ -92,7 +84,6 @@ const ANIMATED_SPRITE_CONFIG: Partial<Record<FxType, AnimatedSpriteConfig>> = {
   },
   [FxType.BuildingExplosion]: {
     url: buildingExplosion,
-    frameWidth: 17,
     frameCount: 10,
     frameDuration: 70,
     looping: false,
@@ -101,7 +92,6 @@ const ANIMATED_SPRITE_CONFIG: Partial<Record<FxType, AnimatedSpriteConfig>> = {
   },
   [FxType.SinkingShip]: {
     url: sinkingShip,
-    frameWidth: 16,
     frameCount: 14,
     frameDuration: 90,
     looping: false,
@@ -110,7 +100,6 @@ const ANIMATED_SPRITE_CONFIG: Partial<Record<FxType, AnimatedSpriteConfig>> = {
   },
   [FxType.Nuke]: {
     url: nuke,
-    frameWidth: 60,
     frameCount: 9,
     frameDuration: 70,
     looping: false,
@@ -119,7 +108,6 @@ const ANIMATED_SPRITE_CONFIG: Partial<Record<FxType, AnimatedSpriteConfig>> = {
   },
   [FxType.SAMExplosion]: {
     url: SAMExplosion,
-    frameWidth: 48,
     frameCount: 9,
     frameDuration: 70,
     looping: false,
@@ -128,7 +116,6 @@ const ANIMATED_SPRITE_CONFIG: Partial<Record<FxType, AnimatedSpriteConfig>> = {
   },
   [FxType.Conquest]: {
     url: conquestSword,
-    frameWidth: 21,
     frameCount: 10,
     frameDuration: 90,
     looping: false,
@@ -181,7 +168,6 @@ export class AnimatedSpriteLoader {
 
     return new AnimatedSprite(
       image,
-      config.frameWidth,
       config.frameCount,
       config.frameDuration,
       config.looping ?? true,
@@ -229,7 +215,6 @@ export class AnimatedSpriteLoader {
 
     return new AnimatedSprite(
       image,
-      config.frameWidth,
       config.frameCount,
       config.frameDuration,
       config.looping ?? true,