From a5bca16d1c35ec662d54a25b05dd528d97dd17ea Mon Sep 17 00:00:00 2001
From: Jakub Hanko <60473007+JakubHanko@users.noreply.github.com>
Date: Thu, 16 May 2024 22:22:41 +0200
Subject: [PATCH] Clean up nits

---
 src/data/battler-tags.ts           | 10 +++++-----
 src/data/enums/battler-tag-type.ts |  4 ++--
 src/data/move.ts                   |  2 +-
 src/field/pokemon.ts               |  8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index 76a79f81d35..52642d2f81c 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -1126,7 +1126,7 @@ export class MagnetRisenTag extends TypeImmuneTag {
   }
 }
 
-export class TypeImmunityIgnoreTag extends BattlerTag {
+export class IgnoreTypeImmunityTag extends BattlerTag {
   public immuneType: Type;
 
   constructor(tagType: BattlerTagType, sourceMove: Moves, type: Type) {
@@ -1411,12 +1411,12 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: integer, sourc
       return new TypeBoostTag(tagType, sourceMove, Type.ELECTRIC, 2, true);
     case BattlerTagType.MAGNET_RISEN:
       return new MagnetRisenTag(tagType, sourceMove);
-    case BattlerTagType.IGNORE_GHOST:
-      return new TypeImmunityIgnoreTag(tagType, sourceMove, Type.GHOST);
-    case BattlerTagType.IGNORE_DARK:
-      return new TypeImmunityIgnoreTag(tagType, sourceMove, Type.DARK);
     case BattlerTagType.MINIMIZED:
       return new MinimizeTag();
+    case BattlerTagType.IGNORE_GHOST:
+      return new IgnoreTypeImmunityTag(tagType, sourceMove, Type.GHOST);
+    case BattlerTagType.IGNORE_DARK:
+      return new IgnoreTypeImmunityTag(tagType, sourceMove, Type.DARK);
     case BattlerTagType.NONE:
     default:
         return new BattlerTag(tagType, BattlerTagLapseType.CUSTOM, turnCount, sourceMove, sourceId);
diff --git a/src/data/enums/battler-tag-type.ts b/src/data/enums/battler-tag-type.ts
index 40d24544766..0369a7a00fb 100644
--- a/src/data/enums/battler-tag-type.ts
+++ b/src/data/enums/battler-tag-type.ts
@@ -56,7 +56,7 @@ export enum BattlerTagType {
   CHARGED = "CHARGED",
   GROUNDED = "GROUNDED",
   MAGNET_RISEN = "MAGNET_RISEN",
+  MINIMIZED = "MINIMIZED",
   IGNORE_GHOST = "IGNORE_GHOST",
-  IGNORE_DARK = "IGNORE_DARK",
-  MINIMIZED = "MINIMIZED"
+  IGNORE_DARK = "IGNORE_DARK"
 }
diff --git a/src/data/move.ts b/src/data/move.ts
index 6bf2a9576eb..a2d66012ffe 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -1955,7 +1955,7 @@ export class ResetStatsAttr extends MoveEffectAttr {
     target.scene.queueMessage(getPokemonMessage(target, `'s stat changes\nwere eliminated!`));
 
     return true;
-  } 
+  }
 }
 
 /**
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 0745be482f2..752883d5c67 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -4,7 +4,7 @@ import { Variant, VariantSet, variantColorCache } from '#app/data/variant';
 import { variantData } from '#app/data/variant';
 import BattleInfo, { PlayerBattleInfo, EnemyBattleInfo } from '../ui/battle-info';
 import { Moves } from "../data/enums/moves";
-import Move, { HighCritAttr, HitsTagAttr, applyMoveAttrs, FixedDamageAttr, VariableAtkAttr, VariablePowerAttr, allMoves, MoveCategory, TypelessAttr, CritOnlyAttr, getMoveTargets, OneHitKOAttr, MultiHitAttr, StatusMoveTypeImmunityAttr, MoveTarget, VariableDefAttr, AttackMove, ModifiedDamageAttr, VariableMoveTypeMultiplierAttr, IgnoreOpponentStatChangesAttr, SacrificialAttr, VariableMoveTypeAttr, VariableMoveCategoryAttr, CounterDamageAttr, StatChangeAttr, RechargeAttr, ChargeAttr, IgnoreWeatherTypeDebuffAttr, ExposedMoveAttr, BypassBurnDamageReductionAttr } from "../data/move";
+import Move, { HighCritAttr, HitsTagAttr, applyMoveAttrs, FixedDamageAttr, VariableAtkAttr, VariablePowerAttr, allMoves, MoveCategory, TypelessAttr, CritOnlyAttr, getMoveTargets, OneHitKOAttr, MultiHitAttr, StatusMoveTypeImmunityAttr, MoveTarget, VariableDefAttr, AttackMove, ModifiedDamageAttr, VariableMoveTypeMultiplierAttr, IgnoreOpponentStatChangesAttr, SacrificialAttr, VariableMoveTypeAttr, VariableMoveCategoryAttr, CounterDamageAttr, StatChangeAttr, RechargeAttr, ChargeAttr, IgnoreWeatherTypeDebuffAttr, BypassBurnDamageReductionAttr } from "../data/move";
 import { default as PokemonSpecies, PokemonSpeciesForm, SpeciesFormKey, getFusedSpeciesName, getPokemonSpecies, getPokemonSpeciesForm, getStarterValueFriendshipCap, speciesStarters, starterPassiveAbilities } from '../data/pokemon-species';
 import * as Utils from '../utils';
 import { Type, TypeDamageMultiplier, getTypeDamageMultiplier, getTypeRgb } from '../data/type';
@@ -19,7 +19,7 @@ import { pokemonEvolutions, pokemonPrevolutions, SpeciesFormEvolution, SpeciesEv
 import { reverseCompatibleTms, tmSpecies, tmPoolTiers } from '../data/tms';
 import { DamagePhase, FaintPhase, LearnMovePhase, ObtainStatusEffectPhase, StatChangePhase, SwitchSummonPhase } from '../phases';
 import { BattleStat } from '../data/battle-stat';
-import { BattlerTag, BattlerTagLapseType, EncoreTag, HelpingHandTag, HighestStatBoostTag, TypeImmunityIgnoreTag, TypeBoostTag, getBattlerTag } from '../data/battler-tags';
+import { BattlerTag, BattlerTagLapseType, EncoreTag, HelpingHandTag, HighestStatBoostTag, IgnoreTypeImmunityTag, TypeBoostTag, getBattlerTag } from '../data/battler-tags';
 import { BattlerTagType } from "../data/enums/battler-tag-type";
 import { Species } from '../data/enums/species';
 import { WeatherType } from '../data/weather';
@@ -966,8 +966,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         if (ignoreImmunity.value)
           return 1;
 
-        const exposedTags = this.getTags(TypeImmunityIgnoreTag) as TypeImmunityIgnoreTag[];
-        if (exposedTags.some(t => t.ignoreImmunity(types, moveType))) {
+        const ignoreTypeImmunityTags = this.getTags(IgnoreTypeImmunityTag) as IgnoreTypeImmunityTag[];
+        if (ignoreTypeImmunityTags.some(t => t.ignoreImmunity(types, moveType))) {
           return 1;
         }
       }