From 5d1bbfa0ed6d9fef4600f44868933a4a1ea5f7ef Mon Sep 17 00:00:00 2001
From: kd8lvt <redunderpant@gmail.com>
Date: Tue, 9 Apr 2024 17:38:48 -0400
Subject: [PATCH] Clean up unused imports & Consistency

---
 src/data/ability.ts | 15 ++++++---------
 src/phases.ts       |  1 -
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/data/ability.ts b/src/data/ability.ts
index 0c5ac258e1e..ddba3d6e672 100644
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@@ -531,7 +531,7 @@ export class PostDefendCritStatChangeAbAttr extends PostDefendAbAttr {
 }
 
 export class PostDefendContactDamageAbAttr extends PostDefendAbAttr {
-  protected damageRatio: integer;
+  private damageRatio: integer;
 
   constructor(damageRatio: integer) {
     super();
@@ -1562,20 +1562,13 @@ export class PostFaintAbAttr extends AbAttr {
   applyPostFaint(pokemon: Pokemon, attacker: Pokemon, move: PokemonMove, hitResult: HitResult, args: any[]): boolean {
     return false;
   }
-
-  getTriggerMessage(pokemon: Pokemon, ...args: any[]): string {
-      return `${pokemon.name}${(pokemon.name.endsWith('s')?`'`:`'s`)} ${pokemon.getAbility().name} hurt\nits attacker!`
-  }
 }
 
 export class PostFaintContactDamageAbAttr extends PostFaintAbAttr {
-  damageRatio: integer;
+  private damageRatio: integer;
   constructor(damageRatio: integer) {
     super();
     this.damageRatio = damageRatio;
-    this.addCondition((pokemon: Pokemon)=>{
-      return pokemon.isFainted(false);
-    });
   }
 
   applyPostFaint(pokemon: Pokemon, attacker: Pokemon, move: PokemonMove, hitResult: HitResult, args: any[]): boolean {
@@ -1585,6 +1578,10 @@ export class PostFaintContactDamageAbAttr extends PostFaintAbAttr {
     }
     return false;
   }
+
+  getTriggerMessage(pokemon: Pokemon, ...args: any[]): string {
+    return `${pokemon.name}${(pokemon.name.endsWith('s')?`'`:`'s`)} ${pokemon.getAbility().name} hurt\nits attacker!`
+  }
 }
 
 export class RedirectMoveAbAttr extends AbAttr {
diff --git a/src/phases.ts b/src/phases.ts
index befa6478015..779686f1f8b 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -56,7 +56,6 @@ import { SaveSlotUiMode } from "./ui/save-slot-select-ui-handler";
 import { fetchDailyRunSeed, getDailyRunStarters } from "./data/daily-run";
 import { GameModes, gameModes } from "./game-mode";
 import { getPokemonSpecies, speciesStarters } from "./data/pokemon-species";
-import { getPositionOfLineAndCharacter } from "typescript";
 
 export class LoginPhase extends Phase {
   private showText: boolean;