From 5e2fd4ef005934a8694e4d44cc13768e576b6bc9 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Thu, 12 Jun 2025 21:27:09 -0700
Subject: [PATCH] Re-apply to `SpeciesFormChangeStatusEffectTrigger`
 constructor

Apply to new instances in test mocks
---
 src/data/pokemon-forms/form-change-triggers.ts  |  7 ++-----
 .../mocks/mocksContainer/mockContainer.ts       | 17 ++++-------------
 .../mocks/mocksContainer/mockRectangle.ts       |  7 ++-----
 .../mocks/mocksContainer/mockSprite.ts          | 10 ++++------
 4 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/src/data/pokemon-forms/form-change-triggers.ts b/src/data/pokemon-forms/form-change-triggers.ts
index eb2c0a557c2..3726781d9e3 100644
--- a/src/data/pokemon-forms/form-change-triggers.ts
+++ b/src/data/pokemon-forms/form-change-triggers.ts
@@ -1,5 +1,5 @@
 import i18next from "i18next";
-import type { Constructor } from "#app/utils/common";
+import { coerceArray, type Constructor } from "#app/utils/common";
 import type { TimeOfDay } from "#enums/time-of-day";
 import type Pokemon from "#app/field/pokemon";
 import type { SpeciesFormChange } from "#app/data/pokemon-forms";
@@ -125,10 +125,7 @@ export class SpeciesFormChangeStatusEffectTrigger extends SpeciesFormChangeTrigg
 
   constructor(statusEffects: StatusEffect | StatusEffect[], invert = false) {
     super();
-    if (!Array.isArray(statusEffects)) {
-      statusEffects = [statusEffects];
-    }
-    this.statusEffects = statusEffects;
+    this.statusEffects = coerceArray(statusEffects);
     this.invert = invert;
     // this.description = i18next.t("pokemonEvolutions:Forms.statusEffect");
   }
diff --git a/test/testUtils/mocks/mocksContainer/mockContainer.ts b/test/testUtils/mocks/mocksContainer/mockContainer.ts
index f1371643ce3..d31165bb847 100644
--- a/test/testUtils/mocks/mocksContainer/mockContainer.ts
+++ b/test/testUtils/mocks/mocksContainer/mockContainer.ts
@@ -1,3 +1,4 @@
+import { coerceArray } from "#app/utils/common";
 import type MockTextureManager from "#test/testUtils/mocks/mockTextureManager";
 import type { MockGameObject } from "../mockGameObject";
 
@@ -216,11 +217,7 @@ export default class MockContainer implements MockGameObject {
   }
 
   add(obj: MockGameObject | MockGameObject[]): this {
-    if (Array.isArray(obj)) {
-      this.list.push(...obj);
-    } else {
-      this.list.push(obj);
-    }
+    this.list.push(...coerceArray(obj));
     return this;
   }
 
@@ -232,18 +229,12 @@ export default class MockContainer implements MockGameObject {
 
   addAt(obj: MockGameObject | MockGameObject[], index = 0): this {
     // Adds a Game Object to this Container at the given index.
-    if (!Array.isArray(obj)) {
-      obj = [obj];
-    }
-    this.list.splice(index, 0, ...obj);
+    this.list.splice(index, 0, ...coerceArray(obj));
     return this;
   }
 
   remove(obj: MockGameObject | MockGameObject[], destroyChild = false): this {
-    if (!Array.isArray(obj)) {
-      obj = [obj];
-    }
-    for (const item of obj) {
+    for (const item of coerceArray(obj)) {
       const index = this.list.indexOf(item);
       if (index !== -1) {
         this.list.splice(index, 1);
diff --git a/test/testUtils/mocks/mocksContainer/mockRectangle.ts b/test/testUtils/mocks/mocksContainer/mockRectangle.ts
index 7f54a0e255f..a8eeb370115 100644
--- a/test/testUtils/mocks/mocksContainer/mockRectangle.ts
+++ b/test/testUtils/mocks/mocksContainer/mockRectangle.ts
@@ -1,3 +1,4 @@
+import { coerceArray } from "#app/utils/common";
 import type { MockGameObject } from "../mockGameObject";
 
 export default class MockRectangle implements MockGameObject {
@@ -50,11 +51,7 @@ export default class MockRectangle implements MockGameObject {
 
   add(obj: MockGameObject | MockGameObject[]): this {
     // Adds a child to this Game Object.
-    if (Array.isArray(obj)) {
-      this.list.push(...obj);
-    } else {
-      this.list.push(obj);
-    }
+    this.list.push(...coerceArray(obj));
     return this;
   }
 
diff --git a/test/testUtils/mocks/mocksContainer/mockSprite.ts b/test/testUtils/mocks/mocksContainer/mockSprite.ts
index df36b3a29fd..ed1f1df6609 100644
--- a/test/testUtils/mocks/mocksContainer/mockSprite.ts
+++ b/test/testUtils/mocks/mocksContainer/mockSprite.ts
@@ -1,6 +1,8 @@
+import { coerceArray } from "#app/utils/common";
 import Phaser from "phaser";
 import type { MockGameObject } from "../mockGameObject";
-import Frame = Phaser.Textures.Frame;
+
+type Frame = Phaser.Textures.Frame;
 
 export default class MockSprite implements MockGameObject {
   private phaserSprite;
@@ -204,11 +206,7 @@ export default class MockSprite implements MockGameObject {
 
   add(obj: MockGameObject | MockGameObject[]): this {
     // Adds a child to this Game Object.
-    if (Array.isArray(obj)) {
-      this.list.push(...obj);
-    } else {
-      this.list.push(obj);
-    }
+    this.list.push(...coerceArray(obj));
     return this;
   }