From 891ee0482f15f5240787c5bf496607f414e0f7f4 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Mon, 14 Oct 2024 01:47:56 -0700
Subject: [PATCH] Redundant code :despair:

---
 src/data/ability.ts                      |  8 +++++---
 src/data/move.ts                         | 15 +++++++++------
 src/data/status-effect.ts                | 16 ++++++++++------
 src/phases/obtain-status-effect-phase.ts | 18 ++++++++++--------
 4 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/src/data/ability.ts b/src/data/ability.ts
index 45ec5685427..dc8fd42f7eb 100644
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@@ -4198,10 +4198,12 @@ export class BlockRedirectAbAttr extends AbAttr { }
  * @see {@linkcode apply}
  */
 export class ReduceStatusEffectDurationAbAttr extends AbAttr {
-  constructor(
-    private statusEffect: StatusEffect
-  ) {
+  private statusEffect: StatusEffect;
+
+  constructor(statusEffect: StatusEffect) {
     super(true);
+
+    this.statusEffect = statusEffect;
   }
 
   /**
diff --git a/src/data/move.ts b/src/data/move.ts
index c908dde71b0..def39131cb0 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -2037,13 +2037,16 @@ export class WaterShurikenMultiHitTypeAttr extends ChangeMultiHitTypeAttr {
 }
 
 export class StatusEffectAttr extends MoveEffectAttr {
-  constructor(
-    public effect: StatusEffect,
-    selfTarget?: boolean,
-    public turnsRemaining?: number,
-    public overrideStatus: boolean = false
-  ) {
+  public effect: StatusEffect;
+  public turnsRemaining?: number;
+  public overrideStatus: boolean = false;
+
+  constructor(effect: StatusEffect, selfTarget?: boolean, turnsRemaining?: number, overrideStatus: boolean = false) {
     super(selfTarget, MoveEffectTrigger.HIT);
+
+    this.effect = effect;
+    this.turnsRemaining = turnsRemaining;
+    this.overrideStatus = overrideStatus;
   }
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
diff --git a/src/data/status-effect.ts b/src/data/status-effect.ts
index 4483d0e8bfa..b1447c83e4f 100644
--- a/src/data/status-effect.ts
+++ b/src/data/status-effect.ts
@@ -5,12 +5,16 @@ import i18next, { ParseKeys } from "i18next";
 export { StatusEffect };
 
 export class Status {
-  constructor(
-    public effect: StatusEffect,
-    /** Toxic damage is `1/16 max HP * toxicTurnCount` */
-    public toxicTurnCount: number = 0,
-    public sleepTurnsRemaining?: number
-  ) {}
+  public effect: StatusEffect;
+  /** Toxic damage is `1/16 max HP * toxicTurnCount` */
+  public toxicTurnCount: number = 0;
+  public sleepTurnsRemaining?: number;
+
+  constructor(effect: StatusEffect, toxicTurnCount: number = 0, sleepTurnsRemaining?: number) {
+    this.effect = effect;
+    this.toxicTurnCount = toxicTurnCount;
+    this.sleepTurnsRemaining = sleepTurnsRemaining;
+  }
 
   incrementTurn(): void {
     this.toxicTurnCount++;
diff --git a/src/phases/obtain-status-effect-phase.ts b/src/phases/obtain-status-effect-phase.ts
index 9c99f951caa..01384b932cb 100644
--- a/src/phases/obtain-status-effect-phase.ts
+++ b/src/phases/obtain-status-effect-phase.ts
@@ -8,16 +8,18 @@ import { getPokemonNameWithAffix } from "#app/messages";
 import { PokemonPhase } from "./pokemon-phase";
 
 export class ObtainStatusEffectPhase extends PokemonPhase {
+  private statusEffect?: StatusEffect;
+  private turnsRemaining?: number;
+  private sourceText?: string | null;
+  private sourcePokemon?: Pokemon | null;
 
-  constructor(
-    scene: BattleScene,
-    battlerIndex: BattlerIndex,
-    private statusEffect?: StatusEffect,
-    private turnsRemaining?: number,
-    private sourceText?: string | null,
-    private sourcePokemon?: Pokemon | null
-  ) {
+  constructor(scene: BattleScene, battlerIndex: BattlerIndex, statusEffect?: StatusEffect, turnsRemaining?: number, sourceText?: string | null, sourcePokemon?: Pokemon | null) {
     super(scene, battlerIndex);
+
+    this.statusEffect = statusEffect;
+    this.turnsRemaining = turnsRemaining;
+    this.sourceText = sourceText;
+    this.sourcePokemon = sourcePokemon;
   }
 
   start() {