Revert "New Year's Eve FX (#2745)"

This reverts commit ec694593a6.

src/client/graphics/AnimatedSpriteLoader.ts

@@ -5,11 +5,6 @@ import dust from "../../../resources/sprites/dust.png";
 import miniExplosion from "../../../resources/sprites/miniExplosion.png";
 import miniFire from "../../../resources/sprites/minifire.png";
 import nuke from "../../../resources/sprites/nukeExplosion.png";
-import conquestChampagne from "../../../resources/sprites/nyeve/conquest.png";
-import nukeEve from "../../../resources/sprites/nyeve/firework.png";
-import nukeEveCyan from "../../../resources/sprites/nyeve/firework_cyan.png";
-import nukeEveRed from "../../../resources/sprites/nyeve/firework_red.png";
-import nukeEveYellow from "../../../resources/sprites/nyeve/firework_yellow.png";
 import SAMExplosion from "../../../resources/sprites/samExplosion.png";
 import sinkingShip from "../../../resources/sprites/sinkingShip.png";
 import miniSmoke from "../../../resources/sprites/smoke.png";
@@ -140,51 +135,6 @@ const ANIMATED_SPRITE_CONFIG: Partial<Record<FxType, AnimatedSpriteConfig>> = {
     originX: 10,
     originY: 16,
   },
-  [FxType.ConquestChampagne]: {
-    url: conquestChampagne,
-    frameWidth: 28,
-    frameCount: 8,
-    frameDuration: 90,
-    looping: false,
-    originX: 14,
-    originY: 23,
-  },
-  [FxType.FireworkAll]: {
-    url: nukeEve,
-    frameWidth: 60,
-    frameCount: 15,
-    frameDuration: 90,
-    looping: false,
-    originX: 30,
-    originY: 30,
-  },
-  [FxType.FireworkRed]: {
-    url: nukeEveRed,
-    frameWidth: 30,
-    frameCount: 9,
-    frameDuration: 100,
-    looping: false,
-    originX: 15,
-    originY: 20,
-  },
-  [FxType.FireworkCyan]: {
-    url: nukeEveCyan,
-    frameWidth: 30,
-    frameCount: 13,
-    frameDuration: 100,
-    looping: false,
-    originX: 15,
-    originY: 20,
-  },
-  [FxType.FireworkYellow]: {
-    url: nukeEveYellow,
-    frameWidth: 30,
-    frameCount: 15,
-    frameDuration: 100,
-    looping: false,
-    originX: 15,
-    originY: 20,
-  },
 };
 
 export class AnimatedSpriteLoader {

src/client/graphics/fx/ConquestFx.ts

@@ -21,7 +21,7 @@ export function conquestFxFactory(
     animatedSpriteLoader,
     x,
     y,
-    FxType.ConquestChampagne,
+    FxType.Conquest,
     2500,
   );
   return new FadeFx(swordAnimation, 0.1, 0.6);

src/client/graphics/fx/Fx.ts

@@ -16,9 +16,4 @@ export enum FxType {
   UnderConstruction = "UnderConstruction",
   Dust = "Dust",
   Conquest = "Conquest",
-  FireworkAll = "FireworkAll",
-  FireworkRed = "FireworkRed",
-  FireworkYellow = "FireworkYellow",
-  FireworkCyan = "FireworkCyan",
-  ConquestChampagne = "ConquestChampagne",
 }

src/client/graphics/fx/NukeFx.ts

@@ -55,7 +55,7 @@ function addSpriteInCircle(
       game.isLand(game.ref(spawnX, spawnY))
     ) {
       const sprite = new FadeFx(
-        new SpriteFx(animatedSpriteLoader, spawnX, spawnY, type),
+        new SpriteFx(animatedSpriteLoader, spawnX, spawnY, type, 6000),
         0.1,
         0.8,
       );
@@ -79,16 +79,19 @@ export function nukeFxFactory(
 ): Fx[] {
   const nukeFx: Fx[] = [];
   // Explosion animation
-  nukeFx.push(new SpriteFx(animatedSpriteLoader, x, y, FxType.FireworkAll));
+  nukeFx.push(new SpriteFx(animatedSpriteLoader, x, y, FxType.Nuke));
+  // Shockwave animation
+  nukeFx.push(new ShockwaveFx(x, y, 1500, radius * 1.5));
   // Ruins and desolation sprites
   const debrisPlan: Array<{
     type: FxType;
     radiusFactor: number;
     density: number;
   }> = [
-    { type: FxType.FireworkRed, radiusFactor: 1.0, density: 1 / 28 },
-    { type: FxType.FireworkCyan, radiusFactor: 0.9, density: 1 / 70 },
-    { type: FxType.FireworkYellow, radiusFactor: 0.9, density: 1 / 70 },
+    { type: FxType.MiniFire, radiusFactor: 1.0, density: 1 / 25 },
+    { type: FxType.MiniSmoke, radiusFactor: 1.0, density: 1 / 28 },
+    { type: FxType.MiniBigSmoke, radiusFactor: 0.9, density: 1 / 70 },
+    { type: FxType.MiniSmokeAndFire, radiusFactor: 0.9, density: 1 / 70 },
   ];
 
   for (const { type, radiusFactor, density } of debrisPlan) {