Merge 7e402d02b0 into 0da37a0f0c

* Added Laser Focus locales

* Fixed key for locales text

* Added `MessageAttr`; cleaned up a lot of other jank move attrs

src/@types/move-types.ts

@@ -1,13 +1,24 @@
+import type { Pokemon } from "#field/pokemon";
 import type {
   AttackMove,
   ChargingAttackMove,
   ChargingSelfStatusMove,
+  Move,
   MoveAttr,
   MoveAttrConstructorMap,
   SelfStatusMove,
   StatusMove,
 } from "#moves/move";
 
+/**
+ * A generic function producing a message during a Move's execution.
+ * @param user - The {@linkcode Pokemon} using the move
+ * @param target - The {@linkcode Pokemon} targeted by the move
+ * @param move - The {@linkcode Move} being used
+ * @returns a string
+ */
+export type MoveMessageFunc = (user: Pokemon, target: Pokemon, move: Move) => string;
+
 export type MoveAttrFilter = (attr: MoveAttr) => boolean;
 
 export type * from "#moves/move";

src/data/abilities/ability.ts

@@ -730,9 +730,7 @@ export class AttackTypeImmunityAbAttr extends TypeImmunityAbAttr {
   override canApply(params: TypeMultiplierAbAttrParams): boolean {
     const { move } = params;
     return (
-      move.category !== MoveCategory.STATUS &&
-      !move.hasAttr("NeutralDamageAgainstFlyingTypeMultiplierAttr") &&
-      super.canApply(params)
+      move.category !== MoveCategory.STATUS && !move.hasAttr("VariableMoveTypeChartAttr") && super.canApply(params)
     );
   }
 }
@@ -1670,6 +1668,7 @@ export class MoveTypeChangeAbAttr extends PreAttackAbAttr {
   constructor(
     private newType: PokemonType,
     private powerMultiplier: number,
+    // TODO: all moves with this attr solely check the move being used...
     private condition?: PokemonAttackCondition,
   ) {
     super(false);
@@ -4190,71 +4189,43 @@ function getWeatherCondition(...weatherTypes: WeatherType[]): AbAttrCondition {
     if (globalScene.arena.weather?.isEffectSuppressed()) {
       return false;
     }
-    const weatherType = globalScene.arena.weather?.weatherType;
-    return !!weatherType && weatherTypes.indexOf(weatherType) > -1;
+    return weatherTypes.includes(globalScene.arena.getWeatherType());
   };
 }
 
-function getAnticipationCondition(): AbAttrCondition {
-  return (pokemon: Pokemon) => {
-    for (const opponent of pokemon.getOpponents()) {
-      for (const move of opponent.moveset) {
-        // ignore null/undefined moves
-        if (!move) {
-          continue;
-        }
-        // the move's base type (not accounting for variable type changes) is super effective
-        if (
-          move.getMove().is("AttackMove") &&
-          pokemon.getAttackTypeEffectiveness(move.getMove().type, opponent, true, undefined, move.getMove()) >= 2
-        ) {
-          return true;
-        }
-        // move is a OHKO
-        if (move.getMove().hasAttr("OneHitKOAttr")) {
-          return true;
-        }
-        // edge case for hidden power, type is computed
-        if (move.getMove().id === MoveId.HIDDEN_POWER) {
-          const iv_val = Math.floor(
-            (((opponent.ivs[Stat.HP] & 1) +
-              (opponent.ivs[Stat.ATK] & 1) * 2 +
-              (opponent.ivs[Stat.DEF] & 1) * 4 +
-              (opponent.ivs[Stat.SPD] & 1) * 8 +
-              (opponent.ivs[Stat.SPATK] & 1) * 16 +
-              (opponent.ivs[Stat.SPDEF] & 1) * 32) *
-              15) /
-              63,
-          );
-
-          const type = [
-            PokemonType.FIGHTING,
-            PokemonType.FLYING,
-            PokemonType.POISON,
-            PokemonType.GROUND,
-            PokemonType.ROCK,
-            PokemonType.BUG,
-            PokemonType.GHOST,
-            PokemonType.STEEL,
-            PokemonType.FIRE,
-            PokemonType.WATER,
-            PokemonType.GRASS,
-            PokemonType.ELECTRIC,
-            PokemonType.PSYCHIC,
-            PokemonType.ICE,
-            PokemonType.DRAGON,
-            PokemonType.DARK,
-          ][iv_val];
-
-          if (pokemon.getAttackTypeEffectiveness(type, opponent) >= 2) {
-            return true;
-          }
-        }
+/**
+ * Condition used by {@linkcode AbilityId.ANTICIPATION} to show a message if any opponent knows a
+ * "dangerous" move.
+ * @param pokemon - The {@linkcode Pokemon} with this ability
+ * @returns Whether the message should be shown
+ */
+const anticipationCondition: AbAttrCondition = (pokemon: Pokemon) =>
+  pokemon.getOpponents().some(opponent =>
+    opponent.moveset.some(movesetMove => {
+      // ignore null/undefined moves or non-attacks
+      const move = movesetMove?.getMove();
+      if (!move?.is("AttackMove")) {
+        return false;
       }
-    }
-    return false;
-  };
-}
+
+      if (move.hasAttr("OneHitKOAttr")) {
+        return true;
+      }
+
+      // Check whether the move's base type (not accounting for variable type changes) is super effective
+      const type = new NumberHolder(
+        pokemon.getAttackTypeEffectiveness(move.type, {
+          source: opponent,
+          ignoreStrongWinds: true,
+          move: move,
+        }),
+      );
+
+      // edge case for hidden power, type is computed
+      applyMoveAttrs("HiddenPowerTypeAttr", opponent, pokemon, move, type);
+      return type.value >= 2;
+    }),
+  );
 
 /**
  * Creates an ability condition that causes the ability to fail if that ability
@@ -7085,7 +7056,7 @@ export function initAbilities() {
       .attr(PostFaintContactDamageAbAttr, 4)
       .bypassFaint(),
     new Ability(AbilityId.ANTICIPATION, 4)
-      .conditionalAttr(getAnticipationCondition(), PostSummonMessageAbAttr, (pokemon: Pokemon) => i18next.t("abilityTriggers:postSummonAnticipation", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })),
+      .conditionalAttr(anticipationCondition, PostSummonMessageAbAttr, (pokemon: Pokemon) => i18next.t("abilityTriggers:postSummonAnticipation", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })),
     new Ability(AbilityId.FOREWARN, 4)
       .attr(ForewarnAbAttr),
     new Ability(AbilityId.UNAWARE, 4)

src/data/arena-tag.ts

@@ -958,7 +958,7 @@ class StealthRockTag extends ArenaTrapTag {
   }
 
   getDamageHpRatio(pokemon: Pokemon): number {
-    const effectiveness = pokemon.getAttackTypeEffectiveness(PokemonType.ROCK, undefined, true);
+    const effectiveness = pokemon.getAttackTypeEffectiveness(PokemonType.ROCK, { ignoreStrongWinds: true });
 
     let damageHpRatio = 0;
 

src/data/moves/move.ts

@@ -67,7 +67,7 @@ import { StatusEffect } from "#enums/status-effect";
 import { SwitchType } from "#enums/switch-type";
 import { WeatherType } from "#enums/weather-type";
 import { MoveUsedEvent } from "#events/battle-scene";
-import type { EnemyPokemon, Pokemon } from "#field/pokemon";
+import { EnemyPokemon, Pokemon } from "#field/pokemon";
 import {
   AttackTypeBoosterModifier,
   BerryModifier,
@@ -86,7 +86,7 @@ import { PokemonHealPhase } from "#phases/pokemon-heal-phase";
 import { SwitchSummonPhase } from "#phases/switch-summon-phase";
 import type { AttackMoveResult } from "#types/attack-move-result";
 import type { Localizable } from "#types/locales";
-import type { ChargingMove, MoveAttrMap, MoveAttrString, MoveClassMap, MoveKindString } from "#types/move-types";
+import type { ChargingMove, MoveAttrMap, MoveAttrString, MoveClassMap, MoveKindString, MoveMessageFunc } from "#types/move-types";
 import type { TurnMove } from "#types/turn-move";
 import { BooleanHolder, type Constructor, isNullOrUndefined, NumberHolder, randSeedFloat, randSeedInt, randSeedItem, toDmgValue } from "#utils/common";
 import { getEnumValues } from "#utils/enums";
@@ -999,7 +999,7 @@ export class AttackMove extends Move {
     const ret = super.getTargetBenefitScore(user, target, move);
     let attackScore = 0;
 
-    const effectiveness = target.getAttackTypeEffectiveness(this.type, user, undefined, undefined, this);
+    const effectiveness = target.getAttackTypeEffectiveness(this.type, {source: user, move: this});
     attackScore = Math.pow(effectiveness - 1, 2) * (effectiveness < 1 ? -2 : 2);
     const [ thisStat, offStat ]: EffectiveStat[] = this.category === MoveCategory.PHYSICAL ? [ Stat.ATK, Stat.SPATK ] : [ Stat.SPATK, Stat.ATK ];
     const statHolder = new NumberHolder(user.getEffectiveStat(thisStat, target));
@@ -1357,20 +1357,20 @@ export class MoveHeaderAttr extends MoveAttr {
 
 /**
  * Header attribute to queue a message at the beginning of a turn.
- * @see {@link MoveHeaderAttr}
  */
 export class MessageHeaderAttr extends MoveHeaderAttr {
-  private message: string | ((user: Pokemon, move: Move) => string);
+  /** The message to display, or a function producing one. */
+  private message: string | MoveMessageFunc;
 
-  constructor(message: string | ((user: Pokemon, move: Move) => string)) {
+  constructor(message: string | MoveMessageFunc) {
     super();
     this.message = message;
   }
 
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+  apply(user: Pokemon, target: Pokemon, move: Move): boolean {
     const message = typeof this.message === "string"
       ? this.message
-      : this.message(user, move);
+      : this.message(user, target, move);
 
     if (message) {
       globalScene.phaseManager.queueMessage(message);
@@ -1418,21 +1418,21 @@ export class BeakBlastHeaderAttr extends AddBattlerTagHeaderAttr {
  */
 export class PreMoveMessageAttr extends MoveAttr {
   /** The message to display or a function returning one */
-  private message: string | ((user: Pokemon, target: Pokemon, move: Move) => string | undefined);
+  private message: string | MoveMessageFunc;
 
   /**
    * Create a new {@linkcode PreMoveMessageAttr} to display a message before move execution.
-   * @param message - The message to display before move use, either as a string or a function producing one.
+   * @param message - The message to display before move use, either` a literal string or a function producing one.
    * @remarks
-   * If {@linkcode message} evaluates to an empty string (`''`), no message will be displayed
+   * If {@linkcode message} evaluates to an empty string (`""`), no message will be displayed
    * (though the move will still succeed).
    */
-  constructor(message: string | ((user: Pokemon, target: Pokemon, move: Move) => string)) {
+  constructor(message: string | MoveMessageFunc) {
     super();
     this.message = message;
   }
 
-  apply(user: Pokemon, target: Pokemon, move: Move, _args: any[]): boolean {
+  apply(user: Pokemon, target: Pokemon, move: Move): boolean {
     const message = typeof this.message === "function"
       ? this.message(user, target, move)
       : this.message;
@@ -1453,18 +1453,17 @@ export class PreMoveMessageAttr extends MoveAttr {
  * @extends MoveAttr
  */
 export class PreUseInterruptAttr extends MoveAttr {
-  protected message?: string | ((user: Pokemon, target: Pokemon, move: Move) => string);
-  protected overridesFailedMessage: boolean;
+  protected message: string | MoveMessageFunc;
   protected conditionFunc: MoveConditionFunc;
 
   /**
    * Create a new MoveInterruptedMessageAttr.
    * @param message The message to display when the move is interrupted, or a function that formats the message based on the user, target, and move.
    */
-  constructor(message?: string | ((user: Pokemon, target: Pokemon, move: Move) => string), conditionFunc?: MoveConditionFunc) {
+  constructor(message: string | MoveMessageFunc, conditionFunc: MoveConditionFunc) {
     super();
     this.message = message;
-    this.conditionFunc = conditionFunc ?? (() => true);
+    this.conditionFunc = conditionFunc;
   }
 
   /**
@@ -1485,11 +1484,9 @@ export class PreUseInterruptAttr extends MoveAttr {
    */
   override getFailedText(user: Pokemon, target: Pokemon, move: Move): string | undefined {
     if (this.message && this.conditionFunc(user, target, move)) {
-      const message =
-        typeof this.message === "string"
-          ? (this.message as string)
+      return typeof this.message === "string"
+          ? this.message
           : this.message(user, target, move);
-      return message;
     }
   }
 }
@@ -1694,17 +1691,30 @@ export class SurviveDamageAttr extends ModifiedDamageAttr {
   }
 }
 
-export class SplashAttr extends MoveEffectAttr {
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    globalScene.phaseManager.queueMessage(i18next.t("moveTriggers:splash"));
-    return true;
-  }
-}
+/**
+ * Move attribute to display arbitrary text during a move's execution.
+ */
+export class MessageAttr extends MoveEffectAttr {
+  /** The message to display, either as a string or a function returning one. */
+  private message: string | MoveMessageFunc;
 
-export class CelebrateAttr extends MoveEffectAttr {
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    globalScene.phaseManager.queueMessage(i18next.t("moveTriggers:celebrate", { playerName: loggedInUser?.username }));
-    return true;
+  constructor(message: string | MoveMessageFunc, options?: MoveEffectAttrOptions) {
+    // TODO: Do we need to respect `selfTarget` if we're just displaying text?
+    super(false, options)
+    this.message = message;
+  }
+
+  override apply(user: Pokemon, target: Pokemon, move: Move): boolean {
+    const message = typeof this.message === "function"
+      ? this.message(user, target, move)
+      : this.message;
+
+    // TODO: Consider changing if/when MoveAttr `apply` return values become significant
+    if (message) {
+      globalScene.phaseManager.queueMessage(message, 500);
+      return true;
+    }
+    return false;
   }
 }
 
@@ -1795,7 +1805,7 @@ export class SacrificialAttr extends MoveEffectAttr {
     if (user.isBoss()) {
       return -20;
     }
-    return Math.ceil(((1 - user.getHpRatio()) * 10 - 10) * (target.getAttackTypeEffectiveness(move.type, user) - 0.5));
+    return Math.ceil(((1 - user.getHpRatio()) * 10 - 10) * (target.getAttackTypeEffectiveness(move.type, {source: user}) - 0.5));
   }
 }
 
@@ -1833,7 +1843,7 @@ export class SacrificialAttrOnHit extends MoveEffectAttr {
     if (user.isBoss()) {
       return -20;
     }
-    return Math.ceil(((1 - user.getHpRatio()) * 10 - 10) * (target.getAttackTypeEffectiveness(move.type, user) - 0.5));
+    return Math.ceil(((1 - user.getHpRatio()) * 10 - 10) * (target.getAttackTypeEffectiveness(move.type, {source: user}) - 0.5));
   }
 }
 
@@ -1875,7 +1885,7 @@ export class HalfSacrificialAttr extends MoveEffectAttr {
     if (user.isBoss()) {
       return -10;
     }
-    return Math.ceil(((1 - user.getHpRatio() / 2) * 10 - 10) * (target.getAttackTypeEffectiveness(move.type, user) - 0.5));
+    return Math.ceil(((1 - user.getHpRatio() / 2) * 10 - 10) * (target.getAttackTypeEffectiveness(move.type, {source: user}) - 0.5));
   }
 }
 
@@ -5349,86 +5359,80 @@ export class CombinedPledgeTypeAttr extends VariableMoveTypeAttr {
   }
 }
 
-export class VariableMoveTypeMultiplierAttr extends MoveAttr {
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    return false;
-  }
-}
-
-export class NeutralDamageAgainstFlyingTypeMultiplierAttr extends VariableMoveTypeMultiplierAttr {
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    if (!target.getTag(BattlerTagType.IGNORE_FLYING)) {
-      const multiplier = args[0] as NumberHolder;
-      //When a flying type is hit, the first hit is always 1x multiplier.
-      if (target.isOfType(PokemonType.FLYING)) {
-        multiplier.value = 1;
-      }
-      return true;
-    }
-
-    return false;
-  }
-}
-
-export class IceNoEffectTypeAttr extends VariableMoveTypeMultiplierAttr {
-  /**
-   * Checks to see if the Target is Ice-Type or not. If so, the move will have no effect.
-   * @param user n/a
-   * @param target The {@linkcode Pokemon} targeted by the move
-   * @param move n/a
-   * @param args `[0]` a {@linkcode NumberHolder | NumberHolder} containing a type effectiveness multiplier
-   * @returns `true` if this Ice-type immunity applies; `false` otherwise
-   */
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const multiplier = args[0] as NumberHolder;
-    if (target.isOfType(PokemonType.ICE)) {
-      multiplier.value = 0;
-      return true;
-    }
-    return false;
-  }
-}
-
-export class FlyingTypeMultiplierAttr extends VariableMoveTypeMultiplierAttr {
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const multiplier = args[0] as NumberHolder;
-    multiplier.value *= target.getAttackTypeEffectiveness(PokemonType.FLYING, user);
-    return true;
-  }
-}
-
 /**
  * Attribute for moves which have a custom type chart interaction.
  */
 export class VariableMoveTypeChartAttr extends MoveAttr {
   /**
-   * @param user {@linkcode Pokemon} using the move
-   * @param target {@linkcode Pokemon} target of the move
-   * @param move {@linkcode Move} with this attribute
-   * @param args [0] {@linkcode NumberHolder} holding the type effectiveness
-   * @param args [1] A single defensive type of the target
-   *
-   * @returns true if application of the attribute succeeds
+   * @param user - The {@linkcode Pokemon} using the move
+   * @param target - The {@linkcode Pokemon} targeted by the move
+   * @param move - The {@linkcode Move} with this attribute
+   * @param args -
+   * `[0]`: A {@linkcode NumberHolder} holding the type effectiveness
+   * `[1]`: The target's entire defensive type profile
+   * `[2]`: The current {@linkcode PokemonType} of the move
+   * @returns `true` if application of the attribute succeeds
    */
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+  apply(user: Pokemon, target: Pokemon, move: Move, args: [multiplier: NumberHolder, types: PokemonType[], moveType: PokemonType]): boolean {
     return false;
   }
 }
 
 /**
- * This class forces Freeze-Dry to be super effective against Water Type.
+ * Attribute to implement {@linkcode MoveId.FREEZE_DRY}'s guaranteed water type super effectiveness.
  */
 export class FreezeDryAttr extends VariableMoveTypeChartAttr {
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const multiplier = args[0] as NumberHolder;
-    const defType = args[1] as PokemonType;
-
-    if (defType === PokemonType.WATER) {
-      multiplier.value = 2;
-      return true;
-    } else {
+  apply(user: Pokemon, target: Pokemon, move: Move, args: [multiplier: NumberHolder, types: PokemonType[], moveType: PokemonType]): boolean {
+    const [multiplier, types, moveType] = args;
+    if (!types.includes(PokemonType.WATER)) {
       return false;
     }
+
+    // Replace whatever the prior "normal" water effectiveness was with a guaranteed 2x multi
+    const normalEff = getTypeDamageMultiplier(moveType, PokemonType.WATER)
+    multiplier.value = 2 * multiplier.value / normalEff;
+    return true;
+  }
+}
+
+/**
+ * Attribute used by {@linkcode MoveId.THOUSAND_ARROWS} to cause it to deal a fixed 1x damage
+ * against all ungrounded flying types.
+ */
+export class NeutralDamageAgainstFlyingTypeAttr extends VariableMoveTypeChartAttr {
+  apply(user: Pokemon, target: Pokemon, move: Move, args: [multiplier: NumberHolder, types: PokemonType[], moveType: PokemonType]): boolean {
+    const [multiplier, types] = args;
+    if (target.isGrounded() || !types.includes(PokemonType.FLYING)) {
+      return false;
+    }
+    multiplier.value = 1;
+
+    return true;
+  }
+}
+
+/**
+ * Attribute used by {@linkcode MoveId.FLYING_PRESS} to add the Flying Type to its type effectiveness.
+ */
+export class FlyingTypeMultiplierAttr extends VariableMoveTypeChartAttr {
+  apply(user: Pokemon, target: Pokemon, _move: Move, args: [multiplier: NumberHolder, types: PokemonType[], moveType: PokemonType]): boolean {
+    const multiplier = args[0];
+    multiplier.value *= target.getAttackTypeEffectiveness(PokemonType.FLYING, {source: user});
+    return true;
+  }
+}
+
+/**
+ * Attribute used by {@linkcode MoveId.SHEER_COLD} to implement its Gen VII+ ice ineffectiveness.
+ */
+export class IceNoEffectTypeAttr extends VariableMoveTypeChartAttr {
+  apply(user: Pokemon, target: Pokemon, move: Move, args: [multiplier: NumberHolder, types: PokemonType[], moveType: PokemonType]): boolean {
+    const [multiplier, types] = args;
+    if (types.includes(PokemonType.ICE)) {
+      multiplier.value = 0;
+      return true;
+    }
+    return false;
   }
 }
 
@@ -5916,8 +5920,8 @@ export class ProtectAttr extends AddBattlerTagAttr {
       for (const turnMove of user.getLastXMoves(-1).slice()) {
         if (
           // Quick & Wide guard increment the Protect counter without using it for fail chance
-          !(allMoves[turnMove.move].hasAttr("ProtectAttr") || 
-          [MoveId.QUICK_GUARD, MoveId.WIDE_GUARD].includes(turnMove.move)) || 
+          !(allMoves[turnMove.move].hasAttr("ProtectAttr") ||
+          [MoveId.QUICK_GUARD, MoveId.WIDE_GUARD].includes(turnMove.move)) ||
           turnMove.result !== MoveResult.SUCCESS
         ) {
           break;
@@ -5931,38 +5935,6 @@ export class ProtectAttr extends AddBattlerTagAttr {
   }
 }
 
-export class IgnoreAccuracyAttr extends AddBattlerTagAttr {
-  constructor() {
-    super(BattlerTagType.IGNORE_ACCURACY, true, false, 2);
-  }
-
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    if (!super.apply(user, target, move, args)) {
-      return false;
-    }
-
-    globalScene.phaseManager.queueMessage(i18next.t("moveTriggers:tookAimAtTarget", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target) }));
-
-    return true;
-  }
-}
-
-export class FaintCountdownAttr extends AddBattlerTagAttr {
-  constructor() {
-    super(BattlerTagType.PERISH_SONG, false, true, 4);
-  }
-
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    if (!super.apply(user, target, move, args)) {
-      return false;
-    }
-
-    globalScene.phaseManager.queueMessage(i18next.t("moveTriggers:faintCountdown", { pokemonName: getPokemonNameWithAffix(target), turnCount: this.turnCountMin - 1 }));
-
-    return true;
-  }
-}
-
 /**
  * Attribute to remove all Substitutes from the field.
  * @extends MoveEffectAttr
@@ -6603,8 +6575,10 @@ export class ChillyReceptionAttr extends ForceSwitchOutAttr {
     return (user, target, move) => globalScene.arena.weather?.weatherType !== WeatherType.SNOW || super.getSwitchOutCondition()(user, target, move);
   }
 }
+
 export class RemoveTypeAttr extends MoveEffectAttr {
 
+  // TODO: Remove the message callback
   private removedType: PokemonType;
   private messageCallback: ((user: Pokemon) => void) | undefined;
 
@@ -8146,7 +8120,9 @@ export class UpperHandCondition extends MoveCondition {
   }
 }
 
-export class HitsSameTypeAttr extends VariableMoveTypeMultiplierAttr {
+// TODO: Does this need to extend from this?
+// The only reason it might is to show ineffectiveness text but w/e
+export class HitsSameTypeAttr extends VariableMoveTypeChartAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const multiplier = args[0] as NumberHolder;
     if (!user.getTypes(true).some(type => target.getTypes(true).includes(type))) {
@@ -8299,8 +8275,6 @@ const MoveAttrs = Object.freeze({
   RandomLevelDamageAttr,
   ModifiedDamageAttr,
   SurviveDamageAttr,
-  SplashAttr,
-  CelebrateAttr,
   RecoilAttr,
   SacrificialAttr,
   SacrificialAttrOnHit,
@@ -8417,8 +8391,7 @@ const MoveAttrs = Object.freeze({
   TeraStarstormTypeAttr,
   MatchUserTypeAttr,
   CombinedPledgeTypeAttr,
-  VariableMoveTypeMultiplierAttr,
-  NeutralDamageAgainstFlyingTypeMultiplierAttr,
+  NeutralDamageAgainstFlyingTypeAttr,
   IceNoEffectTypeAttr,
   FlyingTypeMultiplierAttr,
   VariableMoveTypeChartAttr,
@@ -8443,8 +8416,7 @@ const MoveAttrs = Object.freeze({
   RechargeAttr,
   TrapAttr,
   ProtectAttr,
-  IgnoreAccuracyAttr,
-  FaintCountdownAttr,
+  MessageAttr,
   RemoveAllSubstitutesAttr,
   HitsTagAttr,
   HitsTagForDoubleDamageAttr,
@@ -8938,7 +8910,7 @@ export function initMoves() {
     new AttackMove(MoveId.PSYWAVE, PokemonType.PSYCHIC, MoveCategory.SPECIAL, -1, 100, 15, -1, 0, 1)
       .attr(RandomLevelDamageAttr),
     new SelfStatusMove(MoveId.SPLASH, PokemonType.NORMAL, -1, 40, -1, 0, 1)
-      .attr(SplashAttr)
+      .attr(MessageAttr, i18next.t("moveTriggers:splash"))
       .condition(failOnGravityCondition),
     new SelfStatusMove(MoveId.ACID_ARMOR, PokemonType.POISON, -1, 20, -1, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.DEF ], 2, true),
@@ -9000,7 +8972,10 @@ export function initMoves() {
       .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, true, 1)
       .reflectable(),
     new StatusMove(MoveId.MIND_READER, PokemonType.NORMAL, -1, 5, -1, 0, 2)
-      .attr(IgnoreAccuracyAttr),
+      .attr(AddBattlerTagAttr, BattlerTagType.IGNORE_ACCURACY, true, false, 2)
+      .attr(MessageAttr, (user, target) =>
+        i18next.t("moveTriggers:tookAimAtTarget", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target) })
+      ),
     new StatusMove(MoveId.NIGHTMARE, PokemonType.GHOST, 100, 15, -1, 0, 2)
       .attr(AddBattlerTagAttr, BattlerTagType.NIGHTMARE)
       .condition(targetSleptOrComatoseCondition),
@@ -9088,7 +9063,9 @@ export function initMoves() {
         return lastTurnMove.length === 0 || lastTurnMove[0].move !== move.id || lastTurnMove[0].result !== MoveResult.SUCCESS;
       }),
     new StatusMove(MoveId.PERISH_SONG, PokemonType.NORMAL, -1, 5, -1, 0, 2)
-      .attr(FaintCountdownAttr)
+      .attr(AddBattlerTagAttr, BattlerTagType.PERISH_SONG, false, true, 4)
+      .attr(MessageAttr, (_user, target) =>
+         i18next.t("moveTriggers:faintCountdown", { pokemonName: getPokemonNameWithAffix(target), turnCount: 3 }))
       .ignoresProtect()
       .soundBased()
       .condition(failOnBossCondition)
@@ -9104,7 +9081,10 @@ export function initMoves() {
       .attr(MultiHitAttr)
       .makesContact(false),
     new StatusMove(MoveId.LOCK_ON, PokemonType.NORMAL, -1, 5, -1, 0, 2)
-      .attr(IgnoreAccuracyAttr),
+      .attr(AddBattlerTagAttr, BattlerTagType.IGNORE_ACCURACY, true, false, 2)
+      .attr(MessageAttr, (user, target) =>
+        i18next.t("moveTriggers:tookAimAtTarget", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target) })
+      ),
     new AttackMove(MoveId.OUTRAGE, PokemonType.DRAGON, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 2)
       .attr(FrenzyAttr)
       .attr(MissEffectAttr, frenzyMissFunc)
@@ -9331,8 +9311,8 @@ export function initMoves() {
         && (user.status.effect === StatusEffect.BURN || user.status.effect === StatusEffect.POISON || user.status.effect === StatusEffect.TOXIC || user.status.effect === StatusEffect.PARALYSIS) ? 2 : 1)
       .attr(BypassBurnDamageReductionAttr),
     new AttackMove(MoveId.FOCUS_PUNCH, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 150, 100, 20, -1, -3, 3)
-      .attr(MessageHeaderAttr, (user, move) => i18next.t("moveTriggers:isTighteningFocus", { pokemonName: getPokemonNameWithAffix(user) }))
-      .attr(PreUseInterruptAttr, (user, target, move) => i18next.t("moveTriggers:lostFocus", { pokemonName: getPokemonNameWithAffix(user) }), user => !!user.turnData.attacksReceived.find(r => r.damage))
+      .attr(MessageHeaderAttr, (user) => i18next.t("moveTriggers:isTighteningFocus", { pokemonName: getPokemonNameWithAffix(user) }))
+      .attr(PreUseInterruptAttr, (user) => i18next.t("moveTriggers:lostFocus", { pokemonName: getPokemonNameWithAffix(user) }), user => user.turnData.attacksReceived.some(r => r.damage > 0))
       .punchingMove(),
     new AttackMove(MoveId.SMELLING_SALTS, PokemonType.NORMAL, MoveCategory.PHYSICAL, 70, 100, 10, -1, 0, 3)
       .attr(MovePowerMultiplierAttr, (user, target, move) => target.status?.effect === StatusEffect.PARALYSIS ? 2 : 1)
@@ -10433,7 +10413,8 @@ export function initMoves() {
     new AttackMove(MoveId.DAZZLING_GLEAM, PokemonType.FAIRY, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 6)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
     new SelfStatusMove(MoveId.CELEBRATE, PokemonType.NORMAL, -1, 40, -1, 0, 6)
-      .attr(CelebrateAttr),
+      // NB: This needs a lambda function as the user will not be logged in by the time the moves are initialized
+      .attr(MessageAttr, () => i18next.t("moveTriggers:celebrate", { playerName: loggedInUser?.username })),
     new StatusMove(MoveId.HOLD_HANDS, PokemonType.NORMAL, -1, 40, -1, 0, 6)
       .ignoresSubstitute()
       .target(MoveTarget.NEAR_ALLY),
@@ -10454,7 +10435,7 @@ export function initMoves() {
       .attr(HitHealAttr, 0.75)
       .triageMove(),
     new AttackMove(MoveId.THOUSAND_ARROWS, PokemonType.GROUND, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6)
-      .attr(NeutralDamageAgainstFlyingTypeMultiplierAttr)
+      .attr(NeutralDamageAgainstFlyingTypeAttr)
       .attr(FallDownAttr)
       .attr(HitsTagAttr, BattlerTagType.FLYING)
       .attr(HitsTagAttr, BattlerTagType.FLOATING)
@@ -10608,7 +10589,12 @@ export function initMoves() {
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1)
       .reflectable(),
     new SelfStatusMove(MoveId.LASER_FOCUS, PokemonType.NORMAL, -1, 30, -1, 0, 7)
-      .attr(AddBattlerTagAttr, BattlerTagType.ALWAYS_CRIT, true, false),
+      .attr(AddBattlerTagAttr, BattlerTagType.ALWAYS_CRIT, true, false)
+      .attr(MessageAttr, (user) =>
+        i18next.t("battlerTags:laserFocusOnAdd", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(user),
+        }),
+      ),
     new StatusMove(MoveId.GEAR_UP, PokemonType.STEEL, -1, 20, -1, 0, 7)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], 1, false, { condition: (user, target, move) => !![ AbilityId.PLUS, AbilityId.MINUS ].find(a => target.hasAbility(a, false)) })
       .ignoresSubstitute()
@@ -11390,9 +11376,10 @@ export function initMoves() {
     new AttackMove(MoveId.RUINATION, PokemonType.DARK, MoveCategory.SPECIAL, -1, 90, 10, -1, 0, 9)
       .attr(TargetHalfHpDamageAttr),
     new AttackMove(MoveId.COLLISION_COURSE, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 9)
-      .attr(MovePowerMultiplierAttr, (user, target, move) => target.getAttackTypeEffectiveness(move.type, user) >= 2 ? 5461 / 4096 : 1),
+      // TODO: Do we want to change this to 4/3?
+      .attr(MovePowerMultiplierAttr, (user, target, move) => target.getAttackTypeEffectiveness(move.type, {source: user}) >= 2 ? 5461 / 4096 : 1),
     new AttackMove(MoveId.ELECTRO_DRIFT, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 9)
-      .attr(MovePowerMultiplierAttr, (user, target, move) => target.getAttackTypeEffectiveness(move.type, user) >= 2 ? 5461 / 4096 : 1)
+      .attr(MovePowerMultiplierAttr, (user, target, move) => target.getAttackTypeEffectiveness(move.type, {source: user}) >= 2 ? 5461 / 4096 : 1)
       .makesContact(),
     new SelfStatusMove(MoveId.SHED_TAIL, PokemonType.NORMAL, -1, 10, -1, 0, 9)
       .attr(AddSubstituteAttr, 0.5, true)

src/data/type.ts

@@ -2,6 +2,13 @@ import { PokemonType } from "#enums/pokemon-type";
 
 export type TypeDamageMultiplier = 0 | 0.125 | 0.25 | 0.5 | 1 | 2 | 4 | 8;
 
+/**
+ * Get the type effectiveness multiplier of one PokemonType against another.
+ * @param attackType - The {@linkcode PokemonType} of the attacker
+ * @param defType - The {@linkcode PokemonType} of the defender
+ * @returns The type damage multiplier between the two types;
+ * will be either `0`, `0.5`, `1` or `2`.
+ */
 export function getTypeDamageMultiplier(attackType: PokemonType, defType: PokemonType): TypeDamageMultiplier {
   if (attackType === PokemonType.UNKNOWN || defType === PokemonType.UNKNOWN) {
     return 1;

src/field/pokemon.ts

@@ -130,7 +130,8 @@ import {
   TempStatStageBoosterModifier,
 } from "#modifiers/modifier";
 import { applyMoveAttrs } from "#moves/apply-attrs";
-import type { Move } from "#moves/move";
+// biome-ignore lint/correctness/noUnusedImports: TSDoc
+import type { Move, VariableMoveTypeChartAttr } from "#moves/move";
 import { getMoveTargets } from "#moves/move-utils";
 import { PokemonMove } from "#moves/pokemon-move";
 import { loadMoveAnimations } from "#sprites/pokemon-asset-loader";
@@ -205,6 +206,38 @@ type getBaseDamageParams = Omit<damageParams, "effectiveness">;
 /** Type for the parameters of {@linkcode Pokemon#getAttackDamage | getAttackDamage} */
 type getAttackDamageParams = Omit<damageParams, "moveCategory">;
 
+/**
+ * Type for the parameters of {@linkcode Pokemon.getAttackTypeEffectiveness | getAttackTypeEffectiveness}
+ * and associated helper functions.
+ */
+type getAttackTypeEffectivenessParams = {
+  /**
+   * The {@linkcode Pokemon} using the move, used to check the user's Scrappy and Mind's Eye abilities
+   * and the effects of Foresight/Odor Sleuth.
+   */
+  source?: Pokemon;
+  /**
+   * If `true`, ignores the effect of strong winds (used by anticipation, forewarn, stealth rocks)
+   * @defaultValue `false`
+   */
+  ignoreStrongWinds?: boolean;
+  /**
+   * If `true`, will prevent changes to game state during calculations.
+   * @defaultValue `false`
+   */
+  simulated?: boolean;
+  /**
+   * The {@linkcode Move} whose type effectiveness is being checked.
+   * Used for applying {@linkcode VariableMoveTypeChartAttr}
+   */
+  move?: Move;
+  /**
+   * Whether to consider this Pokemon's {@linkcode IllusionData | illusion} when determining types.
+   * @defaultValue `false`
+   */
+  useIllusion?: boolean;
+};
+
 export abstract class Pokemon extends Phaser.GameObjects.Container {
   /**
    * This pokemon's {@link https://bulbapedia.bulbagarden.net/wiki/Personality_value | Personality value/PID},
@@ -2397,11 +2430,10 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
 
     const typeMultiplier = new NumberHolder(
       move.category !== MoveCategory.STATUS || move.hasAttr("RespectAttackTypeImmunityAttr")
-        ? this.getAttackTypeEffectiveness(moveType, source, false, simulated, move, useIllusion)
+        ? this.getAttackTypeEffectiveness(moveType, { source, simulated, move, useIllusion })
         : 1,
     );
 
-    applyMoveAttrs("VariableMoveTypeMultiplierAttr", source, this, move, typeMultiplier);
     if (this.getTypes(true, true).find(t => move.isTypeImmune(source, this, t))) {
       typeMultiplier.value = 0;
     }
@@ -2461,26 +2493,31 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   /**
-   * Calculates the move's type effectiveness multiplier based on the target's type/s.
-   * @param moveType {@linkcode PokemonType} the type of the move being used
-   * @param source {@linkcode Pokemon} the Pokemon using the move
-   * @param ignoreStrongWinds whether or not this ignores strong winds (anticipation, forewarn, stealth rocks)
-   * @param simulated tag to only apply the strong winds effect message when the move is used
-   * @param move (optional) the move whose type effectiveness is to be checked. Used for applying {@linkcode VariableMoveTypeChartAttr}
-   * @param useIllusion - Whether we want the attack type effectiveness on the illusion or not
-   * @returns a multiplier for the type effectiveness
+   * Calculate the type effectiveness multiplier of a Move used **against** this Pokemon.
+   * @param moveType - The {@linkcode PokemonType} of the move being used
+   * @param source - The {@linkcode Pokemon} using the move, used to check the user's Scrappy and Mind's Eye abilities
+   * and the effects of Foresight/Odor Sleuth
+   * @param ignoreStrongWinds - If `true`, ignores the effect of strong winds (used by anticipation, forewarn, stealth rocks);
+   * default `false`
+   * @param simulated - If `true`, will prevent changes to game state during calculations; default `false`
+   * @param move - The {@linkcode Move} whose type effectiveness is being checked. Used for applying {@linkcode VariableMoveTypeChartAttr}
+   * @param useIllusion - Whether to consider this Pokemon's {@linkcode IllusionData | illusion} when determining types; default `false`
+   * @returns The computed type effectiveness multiplier.
    */
   getAttackTypeEffectiveness(
     moveType: PokemonType,
-    source?: Pokemon,
-    ignoreStrongWinds = false,
-    simulated = true,
-    move?: Move,
-    useIllusion = false,
+    {
+      source,
+      ignoreStrongWinds = false,
+      simulated = true,
+      move,
+      useIllusion = false,
+    }: getAttackTypeEffectivenessParams = {},
   ): TypeDamageMultiplier {
     if (moveType === PokemonType.STELLAR) {
       return this.isTerastallized ? 2 : 1;
     }
+
     const types = this.getTypes(true, true, undefined, useIllusion);
     const arena = globalScene.arena;
 
@@ -2493,57 +2530,79 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
       }
     }
 
-    let multiplier = types
-      .map(defenderType => {
-        const multiplier = new NumberHolder(getTypeDamageMultiplier(moveType, defenderType));
-        applyChallenges(ChallengeType.TYPE_EFFECTIVENESS, multiplier);
-        if (move) {
-          applyMoveAttrs("VariableMoveTypeChartAttr", null, this, move, multiplier, defenderType);
-        }
-        if (source) {
-          const ignoreImmunity = new BooleanHolder(false);
-          if (source.isActive(true) && source.hasAbilityWithAttr("IgnoreTypeImmunityAbAttr")) {
-            applyAbAttrs("IgnoreTypeImmunityAbAttr", {
-              pokemon: source,
-              cancelled: ignoreImmunity,
-              simulated,
-              moveType,
-              defenderType,
-            });
-          }
-          if (ignoreImmunity.value) {
-            if (multiplier.value === 0) {
-              return 1;
-            }
-          }
+    const multi = new NumberHolder(1);
+    for (const defenderType of types) {
+      const typeMulti = new NumberHolder(getTypeDamageMultiplier(moveType, defenderType));
+      applyChallenges(ChallengeType.TYPE_EFFECTIVENESS, typeMulti);
+      // If the target is immune to the type in question, check for any effects that would ignore said effect
+      // TODO: Review if the `isActive` check is needed anymore
+      if (
+        source?.isActive(true) &&
+        typeMulti.value === 0 &&
+        this.checkIgnoreTypeImmunity({ source, simulated, moveType, defenderType })
+      ) {
+        typeMulti.value = 1;
+      }
+      multi.value *= typeMulti.value;
+    }
 
-          const exposedTags = this.findTags(tag => tag instanceof ExposedTag) as ExposedTag[];
-          if (exposedTags.some(t => t.ignoreImmunity(defenderType, moveType))) {
-            if (multiplier.value === 0) {
-              return 1;
-            }
-          }
-        }
-        return multiplier.value;
-      })
-      .reduce((acc, cur) => acc * cur, 1) as TypeDamageMultiplier;
+    // Apply any typing changes from Freeze-Dry, etc.
+    if (move) {
+      applyMoveAttrs("VariableMoveTypeChartAttr", null, this, move, multi, types, moveType);
+    }
 
+    // Handle strong winds lowering effectiveness of types super effective against pure flying
     const typeMultiplierAgainstFlying = new NumberHolder(getTypeDamageMultiplier(moveType, PokemonType.FLYING));
     applyChallenges(ChallengeType.TYPE_EFFECTIVENESS, typeMultiplierAgainstFlying);
-    // Handle strong winds lowering effectiveness of types super effective against pure flying
     if (
       !ignoreStrongWinds &&
-      arena.weather?.weatherType === WeatherType.STRONG_WINDS &&
-      !arena.weather.isEffectSuppressed() &&
-      this.isOfType(PokemonType.FLYING) &&
+      arena.getWeatherType() === WeatherType.STRONG_WINDS &&
+      !arena.weather?.isEffectSuppressed() &&
+      types.includes(PokemonType.FLYING) &&
       typeMultiplierAgainstFlying.value === 2
     ) {
-      multiplier /= 2;
+      multi.value /= 2;
       if (!simulated) {
         globalScene.phaseManager.queueMessage(i18next.t("weather:strongWindsEffectMessage"));
       }
     }
-    return multiplier as TypeDamageMultiplier;
+    return multi.value as TypeDamageMultiplier;
+  }
+
+  /**
+   * Sub-method of {@linkcode getAttackTypeEffectiveness} that handles nullifying type immunities.
+   * @param source - The {@linkcode Pokemon} from whom the attack is sourced
+   * @param simulated - If `true`, will prevent displaying messages upon activation
+   * @param moveType - The {@linkcode PokemonType} whose offensive typing is being checked
+   * @param defenderType - The defender's {@linkcode PokemonType} being checked
+   * @returns Whether the type immunity was bypassed
+   */
+  private checkIgnoreTypeImmunity({
+    source,
+    simulated,
+    moveType,
+    defenderType,
+  }: {
+    source: Pokemon;
+    simulated: boolean;
+    moveType: PokemonType;
+    defenderType: PokemonType;
+  }): boolean {
+    const exposedTags = this.findTags(tag => tag instanceof ExposedTag) as ExposedTag[];
+    const hasExposed = exposedTags.some(t => t.ignoreImmunity(defenderType, moveType));
+    if (hasExposed) {
+      return true;
+    }
+
+    const ignoreImmunity = new BooleanHolder(false);
+    applyAbAttrs("IgnoreTypeImmunityAbAttr", {
+      pokemon: source,
+      cancelled: ignoreImmunity,
+      simulated,
+      moveType,
+      defenderType,
+    });
+    return ignoreImmunity.value;
   }
 
   /**
@@ -2563,10 +2622,15 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
      * Based on how effectively this Pokemon defends against the opponent's types.
      * This score cannot be higher than 4.
      */
-    let defScore = 1 / Math.max(this.getAttackTypeEffectiveness(enemyTypes[0], opponent), 0.25);
+    let defScore = 1 / Math.max(this.getAttackTypeEffectiveness(enemyTypes[0], { source: opponent }), 0.25);
     if (enemyTypes.length > 1) {
       defScore *=
-        1 / Math.max(this.getAttackTypeEffectiveness(enemyTypes[1], opponent, false, false, undefined, true), 0.25);
+        // TODO: Shouldn't this pass `simulated=true` here?
+        1 /
+        Math.max(
+          this.getAttackTypeEffectiveness(enemyTypes[1], { source: opponent, simulated: false, useIllusion: true }),
+          0.25,
+        );
     }
 
     const moveset = this.moveset;
@@ -2580,7 +2644,11 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
         continue;
       }
       const moveType = resolvedMove.type;
-      let thisScore = opponent.getAttackTypeEffectiveness(moveType, this, false, true, undefined, true);
+      let thisScore = opponent.getAttackTypeEffectiveness(moveType, {
+        source: this,
+        simulated: true,
+        useIllusion: true,
+      });
 
       // Add STAB multiplier for attack type effectiveness.
       // For now, simply don't apply STAB to moves that may change type

src/game-mode.ts

@@ -62,15 +62,24 @@ export class GameMode implements GameModeConfig {
 
   /**
    * Enables challenges if they are disabled and sets the specified challenge's value
-   * @param challenge The challenge to set
-   * @param value The value to give the challenge. Impact depends on the specific challenge
+   * @param challenge - The challenge to set
+   * @param value - The value to give the challenge. Impact depends on the specific challenge
+   * @param severity - If provided, will override the given severity amount. Unused if `challenge` does not use severity
+   * @todo Add severity support to daily mode challenge setting
    */
-  setChallengeValue(challenge: Challenges, value: number) {
+  setChallengeValue(challenge: Challenges, value: number, severity?: number) {
     if (!this.isChallenge) {
       this.isChallenge = true;
       this.challenges = allChallenges.map(c => copyChallenge(c));
     }
-    this.challenges.filter((chal: Challenge) => chal.id === challenge).map((chal: Challenge) => (chal.value = value));
+    this.challenges
+      .filter((chal: Challenge) => chal.id === challenge)
+      .forEach(chal => {
+        chal.value = value;
+        if (chal.hasSeverity()) {
+          chal.severity = severity ?? chal.severity;
+        }
+      });
   }
 
   /**

test/abilities/illusion.test.ts

@@ -88,6 +88,7 @@ describe("Abilities - Illusion", () => {
     expect(game.field.getPlayerPokemon().summonData.illusion).toBeFalsy();
   });
 
+  // TODO: This doesn't actually check that the ai calls the function this way... useless test
   it("causes enemy AI to consider the illusion's type instead of the actual type when considering move effectiveness", async () => {
     game.override.enemyMoveset([MoveId.FLAMETHROWER, MoveId.PSYCHIC, MoveId.TACKLE]);
     await game.classicMode.startBattle([SpeciesId.ZOROARK, SpeciesId.FEEBAS]);
@@ -97,22 +98,16 @@ describe("Abilities - Illusion", () => {
 
     const flameThrower = enemy.getMoveset()[0]!.getMove();
     const psychic = enemy.getMoveset()[1]!.getMove();
-    const flameThrowerEffectiveness = zoroark.getAttackTypeEffectiveness(
-      flameThrower.type,
-      enemy,
-      undefined,
-      undefined,
-      flameThrower,
-      true,
-    );
-    const psychicEffectiveness = zoroark.getAttackTypeEffectiveness(
-      psychic.type,
-      enemy,
-      undefined,
-      undefined,
-      psychic,
-      true,
-    );
+    const flameThrowerEffectiveness = zoroark.getAttackTypeEffectiveness(flameThrower.type, {
+      source: enemy,
+      move: flameThrower,
+      useIllusion: true,
+    });
+    const psychicEffectiveness = zoroark.getAttackTypeEffectiveness(psychic.type, {
+      source: enemy,
+      move: psychic,
+      useIllusion: true,
+    });
     expect(psychicEffectiveness).above(flameThrowerEffectiveness);
   });
 

test/abilities/tera-shell.test.ts

@@ -1,6 +1,7 @@
 import { AbilityId } from "#enums/ability-id";
 import { BattlerIndex } from "#enums/battler-index";
 import { MoveId } from "#enums/move-id";
+import { PokemonType } from "#enums/pokemon-type";
 import { SpeciesId } from "#enums/species-id";
 import { GameManager } from "#test/test-utils/game-manager";
 import Phaser from "phaser";
@@ -113,4 +114,18 @@ describe("Abilities - Tera Shell", () => {
     }
     expect(spy).toHaveReturnedTimes(2);
   });
+
+  it("should overwrite Freeze-Dry", async () => {
+    await game.classicMode.startBattle([SpeciesId.TERAPAGOS]);
+
+    const terapagos = game.field.getPlayerPokemon();
+    terapagos.summonData.types = [PokemonType.WATER];
+    const spy = vi.spyOn(terapagos, "getMoveEffectiveness");
+
+    game.move.use(MoveId.SPLASH);
+    await game.move.forceEnemyMove(MoveId.FREEZE_DRY);
+    await game.toEndOfTurn();
+
+    expect(spy).toHaveLastReturnedWith(0.5);
+  });
 });

test/arena/weather-strong-winds.test.ts

@@ -42,7 +42,7 @@ describe("Weather - Strong Winds", () => {
     game.move.select(MoveId.THUNDERBOLT);
 
     await game.phaseInterceptor.to(TurnStartPhase);
-    expect(enemy.getAttackTypeEffectiveness(allMoves[MoveId.THUNDERBOLT].type, pikachu)).toBe(0.5);
+    expect(enemy.getAttackTypeEffectiveness(allMoves[MoveId.THUNDERBOLT].type, { source: pikachu })).toBe(0.5);
   });
 
   it("electric type move is neutral for flying type pokemon", async () => {
@@ -53,7 +53,7 @@ describe("Weather - Strong Winds", () => {
     game.move.select(MoveId.THUNDERBOLT);
 
     await game.phaseInterceptor.to(TurnStartPhase);
-    expect(enemy.getAttackTypeEffectiveness(allMoves[MoveId.THUNDERBOLT].type, pikachu)).toBe(1);
+    expect(enemy.getAttackTypeEffectiveness(allMoves[MoveId.THUNDERBOLT].type, { source: pikachu })).toBe(1);
   });
 
   it("ice type move is neutral for flying type pokemon", async () => {
@@ -64,7 +64,7 @@ describe("Weather - Strong Winds", () => {
     game.move.select(MoveId.ICE_BEAM);
 
     await game.phaseInterceptor.to(TurnStartPhase);
-    expect(enemy.getAttackTypeEffectiveness(allMoves[MoveId.ICE_BEAM].type, pikachu)).toBe(1);
+    expect(enemy.getAttackTypeEffectiveness(allMoves[MoveId.ICE_BEAM].type, { source: pikachu })).toBe(1);
   });
 
   it("rock type move is neutral for flying type pokemon", async () => {
@@ -75,7 +75,7 @@ describe("Weather - Strong Winds", () => {
     game.move.select(MoveId.ROCK_SLIDE);
 
     await game.phaseInterceptor.to(TurnStartPhase);
-    expect(enemy.getAttackTypeEffectiveness(allMoves[MoveId.ROCK_SLIDE].type, pikachu)).toBe(1);
+    expect(enemy.getAttackTypeEffectiveness(allMoves[MoveId.ROCK_SLIDE].type, { source: pikachu })).toBe(1);
   });
 
   it("weather goes away when last trainer pokemon dies to indirect damage", async () => {

test/battle/inverse-battle.test.ts

@@ -106,21 +106,6 @@ describe("Inverse Battle", () => {
     expect(currentHp).toBeGreaterThan((maxHp * 31) / 32 - 1);
   });
 
-  it("Freeze Dry is 2x effective against Water Type like other Ice type Move - Freeze Dry against Squirtle", async () => {
-    game.override.moveset([MoveId.FREEZE_DRY]).enemySpecies(SpeciesId.SQUIRTLE);
-
-    await game.challengeMode.startBattle();
-
-    const enemy = game.field.getEnemyPokemon();
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(MoveId.FREEZE_DRY);
-    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
-    await game.phaseInterceptor.to("MoveEffectPhase");
-
-    expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2);
-  });
-
   it("Water Absorb should heal against water moves - Water Absorb against Water gun", async () => {
     game.override.moveset([MoveId.WATER_GUN]).enemyAbility(AbilityId.WATER_ABSORB);
 
@@ -164,6 +149,7 @@ describe("Inverse Battle", () => {
     expect(enemy.status?.effect).not.toBe(StatusEffect.PARALYSIS);
   });
 
+  // TODO: These should belong to their respective moves' test files, not the inverse battle mechanic itself
   it("Ground type is not immune to Thunder Wave - Thunder Wave against Sandshrew", async () => {
     game.override.moveset([MoveId.THUNDER_WAVE]).enemySpecies(SpeciesId.SANDSHREW);
 
@@ -202,21 +188,6 @@ describe("Inverse Battle", () => {
     expect(player.getTypes()[0]).toBe(PokemonType.DRAGON);
   });
 
-  it("Flying Press should be 0.25x effective against Grass + Dark Type - Flying Press against Meowscarada", async () => {
-    game.override.moveset([MoveId.FLYING_PRESS]).enemySpecies(SpeciesId.MEOWSCARADA);
-
-    await game.challengeMode.startBattle();
-
-    const enemy = game.field.getEnemyPokemon();
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(MoveId.FLYING_PRESS);
-    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
-    await game.phaseInterceptor.to("MoveEffectPhase");
-
-    expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(0.25);
-  });
-
   it("Scrappy ability has no effect - Tackle against Ghost Type still 2x effective with Scrappy", async () => {
     game.override.moveset([MoveId.TACKLE]).ability(AbilityId.SCRAPPY).enemySpecies(SpeciesId.GASTLY);
 

test/moves/flying-press.test.ts

@@ -0,0 +1,131 @@
+import { allAbilities, allMoves } from "#data/data-lists";
+import { AbilityId } from "#enums/ability-id";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { Challenges } from "#enums/challenges";
+import { MoveId } from "#enums/move-id";
+import { PokemonType } from "#enums/pokemon-type";
+import { SpeciesId } from "#enums/species-id";
+import type { EnemyPokemon, PlayerPokemon } from "#field/pokemon";
+import { GameManager } from "#test/test-utils/game-manager";
+import { getEnumValues } from "#utils/enums";
+import { toTitleCase } from "#utils/strings";
+import Phaser from "phaser";
+import { afterAll, afterEach, beforeAll, describe, expect, it } from "vitest";
+
+describe.sequential("Move - Flying Press", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+  let hawlucha: PlayerPokemon;
+  let enemy: EnemyPokemon;
+
+  beforeAll(async () => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+
+    game = new GameManager(phaserGame);
+    game.override
+      .ability(AbilityId.BALL_FETCH)
+      .battleStyle("single")
+      .enemySpecies(SpeciesId.MAGIKARP)
+      .enemyAbility(AbilityId.BALL_FETCH)
+      .enemyMoveset(MoveId.SPLASH);
+
+    await game.classicMode.startBattle([SpeciesId.HAWLUCHA]);
+
+    hawlucha = game.field.getPlayerPokemon();
+    enemy = game.field.getEnemyPokemon();
+  });
+
+  afterAll(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  // Reset temp data after each test
+  afterEach(() => {
+    hawlucha.resetSummonData();
+    enemy.resetSummonData();
+  });
+
+  const pokemonTypes = getEnumValues(PokemonType);
+
+  function checkEffForAllTypes(primaryType: PokemonType) {
+    for (const type of pokemonTypes) {
+      enemy.summonData.types = [type];
+      const primaryEff = enemy.getAttackTypeEffectiveness(primaryType, { source: hawlucha });
+      const flyingEff = enemy.getAttackTypeEffectiveness(PokemonType.FLYING, { source: hawlucha });
+      const flyingPressEff = enemy.getAttackTypeEffectiveness(hawlucha.getMoveType(allMoves[MoveId.FLYING_PRESS]), {
+        source: hawlucha,
+        move: allMoves[MoveId.FLYING_PRESS],
+      });
+      expect
+        .soft(
+          flyingPressEff,
+          `Flying Press effectiveness against ${toTitleCase(PokemonType[type])} was incorrect!` +
+            `\nExpected: ${flyingPressEff},` +
+            `\nActual: ${primaryEff * flyingEff} (=${primaryEff} * ${flyingEff})`,
+        )
+        .toBe(primaryEff * flyingEff);
+    }
+  }
+
+  describe("Normal -", () => {
+    it("should deal damage as a Fighting/Flying type move by default", async () => {
+      checkEffForAllTypes(PokemonType.FIGHTING);
+    });
+
+    it("should deal damage as an Electric/Flying type move when Electrify is active", async () => {
+      hawlucha.addTag(BattlerTagType.ELECTRIFIED);
+      checkEffForAllTypes(PokemonType.ELECTRIC);
+    });
+
+    it("should deal damage as a Normal/Flying type move when Normalize is active", async () => {
+      hawlucha.setTempAbility(allAbilities[AbilityId.NORMALIZE]);
+      checkEffForAllTypes(PokemonType.NORMAL);
+    });
+
+    it("should deal 8x damage against a Normal/Ice type with Grass added", () => {
+      enemy.summonData.types = [PokemonType.NORMAL, PokemonType.ICE];
+      enemy.summonData.addedType = PokemonType.GRASS;
+
+      const moveType = hawlucha.getMoveType(allMoves[MoveId.FLYING_PRESS]);
+      const flyingPressEff = enemy.getAttackTypeEffectiveness(moveType, {
+        source: hawlucha,
+        move: allMoves[MoveId.FLYING_PRESS],
+      });
+      expect(flyingPressEff).toBe(8);
+    });
+  });
+
+  describe("Inverse Battle -", () => {
+    beforeAll(() => {
+      game.challengeMode.overrideGameWithChallenges(Challenges.INVERSE_BATTLE, 1, 1);
+    });
+
+    it("should deal damage as a Fighting/Flying type move by default", async () => {
+      checkEffForAllTypes(PokemonType.FIGHTING);
+    });
+
+    it("should deal damage as an Electric/Flying type move when Electrify is active", async () => {
+      hawlucha.addTag(BattlerTagType.ELECTRIFIED);
+      checkEffForAllTypes(PokemonType.ELECTRIC);
+    });
+
+    it("should deal damage as a Normal/Flying type move when Normalize is active", async () => {
+      hawlucha.setTempAbility(allAbilities[AbilityId.NORMALIZE]);
+      checkEffForAllTypes(PokemonType.NORMAL);
+    });
+
+    it("should deal 0.125x damage against a Normal/Ice type with Grass added", () => {
+      enemy.summonData.types = [PokemonType.NORMAL, PokemonType.ICE];
+      enemy.summonData.addedType = PokemonType.GRASS;
+
+      const moveType = hawlucha.getMoveType(allMoves[MoveId.FLYING_PRESS]);
+      const flyingPressEff = enemy.getAttackTypeEffectiveness(moveType, {
+        source: hawlucha,
+        move: allMoves[MoveId.FLYING_PRESS],
+      });
+      expect(flyingPressEff).toBe(0.125);
+    });
+  });
+});

test/moves/freeze-dry.test.ts

@@ -1,330 +1,140 @@
+import { allMoves } from "#data/data-lists";
+import type { TypeDamageMultiplier } from "#data/type";
 import { AbilityId } from "#enums/ability-id";
-import { BattlerIndex } from "#enums/battler-index";
+import { BattlerTagType } from "#enums/battler-tag-type";
 import { Challenges } from "#enums/challenges";
 import { MoveId } from "#enums/move-id";
 import { PokemonType } from "#enums/pokemon-type";
 import { SpeciesId } from "#enums/species-id";
+import type { EnemyPokemon, PlayerPokemon } from "#field/pokemon";
 import { GameManager } from "#test/test-utils/game-manager";
+import { stringifyEnumArray } from "#test/test-utils/string-utils";
 import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { afterAll, afterEach, beforeAll, describe, expect, it } from "vitest";
 
-describe("Moves - Freeze-Dry", () => {
+type typesArray = [PokemonType] | [PokemonType, PokemonType] | [PokemonType, PokemonType, PokemonType];
+
+describe.sequential("Move - Freeze-Dry", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
-  beforeAll(() => {
+  let feebas: PlayerPokemon;
+  let enemy: EnemyPokemon;
+
+  beforeAll(async () => {
     phaserGame = new Phaser.Game({
       type: Phaser.HEADLESS,
     });
-  });
 
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
       .battleStyle("single")
       .enemySpecies(SpeciesId.MAGIKARP)
       .enemyAbility(AbilityId.BALL_FETCH)
       .enemyMoveset(MoveId.SPLASH)
-      .starterSpecies(SpeciesId.FEEBAS)
-      .ability(AbilityId.BALL_FETCH)
-      .moveset([MoveId.FREEZE_DRY, MoveId.FORESTS_CURSE, MoveId.SOAK]);
+      .ability(AbilityId.BALL_FETCH);
+
+    await game.classicMode.startBattle([SpeciesId.FEEBAS]);
+
+    feebas = game.field.getPlayerPokemon();
+    enemy = game.field.getEnemyPokemon();
   });
 
-  it("should deal 2x damage to pure water types", async () => {
-    await game.classicMode.startBattle();
-
-    const enemy = game.field.getEnemyPokemon();
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(MoveId.FREEZE_DRY);
-    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
-    await game.phaseInterceptor.to("MoveEffectPhase");
-
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(2);
+  // Reset temp data after each test
+  afterEach(() => {
+    feebas.resetSummonData();
+    enemy.resetSummonData();
+    enemy.isTerastallized = false;
   });
 
-  it("should deal 4x damage to water/flying types", async () => {
-    game.override.enemySpecies(SpeciesId.WINGULL);
-    await game.classicMode.startBattle();
-
-    const enemy = game.field.getEnemyPokemon();
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(MoveId.FREEZE_DRY);
-    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
-    await game.phaseInterceptor.to("MoveEffectPhase");
-
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(4);
-  });
-
-  it("should deal 1x damage to water/fire types", async () => {
-    game.override.enemySpecies(SpeciesId.VOLCANION);
-    await game.classicMode.startBattle();
-
-    const enemy = game.field.getEnemyPokemon();
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(MoveId.FREEZE_DRY);
-    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
-    await game.phaseInterceptor.to("MoveEffectPhase");
-
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(1);
+  afterAll(() => {
+    game.phaseInterceptor.restoreOg();
   });
 
   /**
-   * Freeze drys forced super effectiveness should overwrite wonder guard
+   * Check that Freeze-Dry is the given effectiveness against the given type.
+   * @param types - The base {@linkcode PokemonType}s to set; will populate `addedType` if above 3
+   * @param multi - The expected {@linkcode TypeDamageMultiplier}
    */
-  it("should deal 2x dmg against soaked wonder guard target", async () => {
-    game.override
-      .enemySpecies(SpeciesId.SHEDINJA)
-      .enemyMoveset(MoveId.SPLASH)
-      .starterSpecies(SpeciesId.MAGIKARP)
-      .moveset([MoveId.SOAK, MoveId.FREEZE_DRY]);
-    await game.classicMode.startBattle();
+  function expectEffectiveness(types: typesArray, multi: TypeDamageMultiplier): void {
+    enemy.summonData.types = types.slice(0, 2);
+    if (types[2] !== undefined) {
+      enemy.summonData.addedType = types[2];
+    }
 
-    const enemy = game.field.getEnemyPokemon();
-    vi.spyOn(enemy, "getMoveEffectiveness");
+    const moveType = feebas.getMoveType(allMoves[MoveId.FREEZE_DRY]);
+    const eff = enemy.getAttackTypeEffectiveness(moveType, { source: feebas, move: allMoves[MoveId.FREEZE_DRY] });
+    expect(
+      eff,
+      `Freeze-dry effectiveness against ${stringifyEnumArray(PokemonType, types)} was ${eff} instead of ${multi}!`,
+    ).toBe(multi);
+  }
 
-    game.move.select(MoveId.SOAK);
-    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
-    await game.toNextTurn();
+  describe("Normal -", () => {
+    it.each<{ name: string; types: typesArray; eff: TypeDamageMultiplier }>([
+      { name: "Pure Water", types: [PokemonType.WATER], eff: 2 },
+      { name: "Water/Ground", types: [PokemonType.WATER, PokemonType.GROUND], eff: 4 },
+      { name: "Water/Flying/Grass", types: [PokemonType.WATER, PokemonType.FLYING, PokemonType.GRASS], eff: 8 },
+      { name: "Water/Fire", types: [PokemonType.WATER, PokemonType.FIRE], eff: 1 },
+    ])("should be $effx effective against a $name-type opponent", ({ types, eff }) => {
+      expectEffectiveness(types, eff);
+    });
 
-    game.move.select(MoveId.FREEZE_DRY);
-    await game.phaseInterceptor.to("MoveEffectPhase");
+    it("should deal 2x dmg against soaked wonder guard target", async () => {
+      game.field.mockAbility(enemy, AbilityId.WONDER_GUARD);
 
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(2);
-    expect(enemy.hp).toBeLessThan(enemy.getMaxHp());
+      expectEffectiveness([PokemonType.WATER], 2);
+    });
+
+    it("should consider the target's Tera Type", async () => {
+      // Steel type terastallized into Water; 2x
+      enemy.teraType = PokemonType.WATER;
+      enemy.isTerastallized = true;
+
+      expectEffectiveness([PokemonType.STEEL], 2);
+
+      // Water type terastallized into steel; 0.5x
+      enemy.teraType = PokemonType.STEEL;
+      expectEffectiveness([PokemonType.WATER], 2);
+    });
+
+    it.each<{ name: string; types: typesArray; eff: TypeDamageMultiplier }>([
+      { name: "Pure Water", types: [PokemonType.WATER], eff: 2 },
+      { name: "Water/Ghost", types: [PokemonType.WATER, PokemonType.GHOST], eff: 0 },
+    ])("should be $effx effective against a $name-type opponent with Normalize", ({ types, eff }) => {
+      game.field.mockAbility(feebas, AbilityId.NORMALIZE);
+      expectEffectiveness(types, eff);
+    });
+
+    it("should not stack with Electrify", async () => {
+      feebas.addTag(BattlerTagType.ELECTRIFIED);
+      expect(feebas.getMoveType(allMoves[MoveId.FREEZE_DRY])).toBe(PokemonType.ELECTRIC);
+
+      expectEffectiveness([PokemonType.WATER], 2);
+    });
   });
 
-  it("should deal 8x damage to water/ground/grass type under Forest's Curse", async () => {
-    game.override.enemySpecies(SpeciesId.QUAGSIRE);
-    await game.classicMode.startBattle();
-
-    const enemy = game.field.getEnemyPokemon();
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(MoveId.FORESTS_CURSE);
-    await game.toNextTurn();
-
-    game.move.select(MoveId.FREEZE_DRY);
-    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
-    await game.phaseInterceptor.to("MoveEffectPhase");
-
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(8);
-  });
-
-  it("should deal 2x damage to steel type terastallized into water", async () => {
-    game.override.enemySpecies(SpeciesId.SKARMORY);
-    await game.classicMode.startBattle();
-
-    const enemy = game.field.getEnemyPokemon();
-    enemy.teraType = PokemonType.WATER;
-    enemy.isTerastallized = true;
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(MoveId.FREEZE_DRY);
-    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
-    await game.phaseInterceptor.to("MoveEffectPhase");
-
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(2);
-  });
-
-  it("should deal 0.5x damage to water type terastallized into fire", async () => {
-    game.override.enemySpecies(SpeciesId.PELIPPER);
-    await game.classicMode.startBattle();
-
-    const enemy = game.field.getEnemyPokemon();
-    enemy.teraType = PokemonType.FIRE;
-    enemy.isTerastallized = true;
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(MoveId.FREEZE_DRY);
-    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
-    await game.phaseInterceptor.to("MoveEffectPhase");
-
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(0.5);
-  });
-
-  it("should deal 0.5x damage to water type Terapagos with Tera Shell", async () => {
-    game.override.enemySpecies(SpeciesId.TERAPAGOS).enemyAbility(AbilityId.TERA_SHELL);
-    await game.classicMode.startBattle();
-
-    const enemy = game.field.getEnemyPokemon();
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(MoveId.SOAK);
-    await game.toNextTurn();
-
-    game.move.select(MoveId.FREEZE_DRY);
-    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
-    await game.phaseInterceptor.to("MoveEffectPhase");
-
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(0.5);
-  });
-
-  it("should deal 2x damage to water type under Normalize", async () => {
-    game.override.ability(AbilityId.NORMALIZE);
-    await game.classicMode.startBattle();
-
-    const enemy = game.field.getEnemyPokemon();
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(MoveId.FREEZE_DRY);
-    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
-    await game.phaseInterceptor.to("MoveEffectPhase");
-
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(2);
-  });
-
-  it("should deal 0.25x damage to rock/steel type under Normalize", async () => {
-    game.override.ability(AbilityId.NORMALIZE).enemySpecies(SpeciesId.SHIELDON);
-    await game.classicMode.startBattle();
-
-    const enemy = game.field.getEnemyPokemon();
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(MoveId.FREEZE_DRY);
-    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
-    await game.phaseInterceptor.to("MoveEffectPhase");
-
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(0.25);
-  });
-
-  it("should deal 0x damage to water/ghost type under Normalize", async () => {
-    game.override.ability(AbilityId.NORMALIZE).enemySpecies(SpeciesId.JELLICENT);
-    await game.classicMode.startBattle();
-
-    const enemy = game.field.getEnemyPokemon();
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(MoveId.FREEZE_DRY);
-    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
-    await game.phaseInterceptor.to("BerryPhase");
-
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(0);
-  });
-
-  it("should deal 2x damage to water type under Electrify", async () => {
-    game.override.enemyMoveset([MoveId.ELECTRIFY]);
-    await game.classicMode.startBattle();
-
-    const enemy = game.field.getEnemyPokemon();
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(MoveId.FREEZE_DRY);
-    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
-    await game.phaseInterceptor.to("BerryPhase");
-
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(2);
-  });
-
-  it("should deal 4x damage to water/flying type under Electrify", async () => {
-    game.override.enemyMoveset([MoveId.ELECTRIFY]).enemySpecies(SpeciesId.GYARADOS);
-    await game.classicMode.startBattle();
-
-    const enemy = game.field.getEnemyPokemon();
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(MoveId.FREEZE_DRY);
-    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
-    await game.phaseInterceptor.to("BerryPhase");
-
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(4);
-  });
-
-  it("should deal 0x damage to water/ground type under Electrify", async () => {
-    game.override.enemyMoveset([MoveId.ELECTRIFY]).enemySpecies(SpeciesId.BARBOACH);
-    await game.classicMode.startBattle();
-
-    const enemy = game.field.getEnemyPokemon();
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(MoveId.FREEZE_DRY);
-    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
-    await game.phaseInterceptor.to("BerryPhase");
-
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(0);
-  });
-
-  it("should deal 0.25x damage to Grass/Dragon type under Electrify", async () => {
-    game.override.enemyMoveset([MoveId.ELECTRIFY]).enemySpecies(SpeciesId.FLAPPLE);
-    await game.classicMode.startBattle();
-
-    const enemy = game.field.getEnemyPokemon();
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(MoveId.FREEZE_DRY);
-    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
-    await game.phaseInterceptor.to("BerryPhase");
-
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(0.25);
-  });
-
-  it("should deal 2x damage to Water type during inverse battle", async () => {
-    game.override.moveset([MoveId.FREEZE_DRY]).enemySpecies(SpeciesId.MAGIKARP);
-    game.challengeMode.addChallenge(Challenges.INVERSE_BATTLE, 1, 1);
-
-    await game.challengeMode.startBattle();
-
-    const enemy = game.field.getEnemyPokemon();
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(MoveId.FREEZE_DRY);
-    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
-    await game.phaseInterceptor.to("MoveEffectPhase");
-
-    expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2);
-  });
-
-  it("should deal 2x damage to Water type during inverse battle under Normalize", async () => {
-    game.override.moveset([MoveId.FREEZE_DRY]).ability(AbilityId.NORMALIZE).enemySpecies(SpeciesId.MAGIKARP);
-    game.challengeMode.addChallenge(Challenges.INVERSE_BATTLE, 1, 1);
-
-    await game.challengeMode.startBattle();
-
-    const enemy = game.field.getEnemyPokemon();
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(MoveId.FREEZE_DRY);
-    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
-    await game.phaseInterceptor.to("MoveEffectPhase");
-
-    expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2);
-  });
-
-  it("should deal 2x damage to Water type during inverse battle under Electrify", async () => {
-    game.override.moveset([MoveId.FREEZE_DRY]).enemySpecies(SpeciesId.MAGIKARP).enemyMoveset([MoveId.ELECTRIFY]);
-    game.challengeMode.addChallenge(Challenges.INVERSE_BATTLE, 1, 1);
-
-    await game.challengeMode.startBattle();
-
-    const enemy = game.field.getEnemyPokemon();
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(MoveId.FREEZE_DRY);
-    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
-    await game.phaseInterceptor.to("MoveEffectPhase");
-
-    expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2);
-  });
-
-  it("should deal 1x damage to water/flying type during inverse battle under Electrify", async () => {
-    game.override.enemyMoveset([MoveId.ELECTRIFY]).enemySpecies(SpeciesId.GYARADOS);
-
-    game.challengeMode.addChallenge(Challenges.INVERSE_BATTLE, 1, 1);
-
-    await game.challengeMode.startBattle();
-
-    const enemy = game.field.getEnemyPokemon();
-    vi.spyOn(enemy, "getMoveEffectiveness");
-
-    game.move.select(MoveId.FREEZE_DRY);
-    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
-    await game.phaseInterceptor.to("BerryPhase");
-
-    expect(enemy.getMoveEffectiveness).toHaveReturnedWith(1);
+  describe("Inverse Battle -", () => {
+    beforeAll(() => {
+      game.challengeMode.overrideGameWithChallenges(Challenges.INVERSE_BATTLE, 1, 1);
+    });
+
+    it("should deal 2x damage to Water type", async () => {
+      expectEffectiveness([PokemonType.WATER], 2);
+    });
+
+    it("should deal 2x damage to Water type under Normalize", async () => {
+      game.field.mockAbility(feebas, AbilityId.NORMALIZE);
+      expectEffectiveness([PokemonType.WATER], 2);
+    });
+
+    it("should still deal 2x damage to Water type under Electrify", async () => {
+      feebas.addTag(BattlerTagType.ELECTRIFIED);
+      expectEffectiveness([PokemonType.WATER], 2);
+    });
+
+    it("should deal 1x damage to Water/Flying type under Electrify", async () => {
+      feebas.addTag(BattlerTagType.ELECTRIFIED);
+      expectEffectiveness([PokemonType.WATER, PokemonType.FLYING], 1);
+    });
   });
 });

test/moves/synchronoise.test.ts

@@ -32,16 +32,25 @@ describe("Moves - Synchronoise", () => {
       .enemyMoveset(MoveId.SPLASH);
   });
 
-  it("should consider the user's tera type if it is terastallized", async () => {
+  // TODO: Write test
+  it.todo("should affect all opponents that share a type with the user");
+
+  it("should consider the user's Tera Type if it is Terastallized", async () => {
     await game.classicMode.startBattle([SpeciesId.BIDOOF]);
+
     const playerPokemon = game.field.getPlayerPokemon();
     const enemyPokemon = game.field.getEnemyPokemon();
 
-    // force the player to be terastallized
     playerPokemon.teraType = PokemonType.WATER;
-    playerPokemon.isTerastallized = true;
-    game.move.select(MoveId.SYNCHRONOISE);
-    await game.phaseInterceptor.to("BerryPhase");
-    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
+    game.move.selectWithTera(MoveId.SYNCHRONOISE);
+    await game.toEndOfTurn();
+
+    expect(enemyPokemon).not.toHaveFullHp();
   });
+
+  // TODO: Write test
+  it.todo("should fail if no opponents share a type with the user");
+
+  // TODO: Write test
+  it.todo("should fail if the user is typeless");
 });

test/moves/whirlwind.test.ts

@@ -1,4 +1,3 @@
-import { globalScene } from "#app/global-scene";
 import { Status } from "#data/status-effect";
 import { AbilityId } from "#enums/ability-id";
 import { BattleType } from "#enums/battle-type";
@@ -179,18 +178,13 @@ describe("Moves - Whirlwind", () => {
     const eligibleEnemy = enemyParty.filter(p => p.hp > 0 && p.isAllowedInBattle());
     expect(eligibleEnemy.length).toBe(1);
 
-    // Spy on the queueMessage function
-    const queueSpy = vi.spyOn(globalScene.phaseManager, "queueMessage");
-
     // Player uses Whirlwind; opponent uses Splash
     game.move.select(MoveId.WHIRLWIND);
     await game.move.selectEnemyMove(MoveId.SPLASH);
     await game.toNextTurn();
 
-    // Verify that the failure message is displayed for Whirlwind
-    expect(queueSpy).toHaveBeenCalledWith(expect.stringContaining("But it failed"));
-    // Verify the opponent's Splash message
-    expect(queueSpy).toHaveBeenCalledWith(expect.stringContaining("But nothing happened!"));
+    const player = game.field.getPlayerPokemon();
+    expect(player).toHaveUsedMove({ move: MoveId.WHIRLWIND, result: MoveResult.FAIL });
   });
 
   it("should not pull in the other trainer's pokemon in a partner trainer battle", async () => {

test/test-utils/helpers/challenge-mode-helper.ts

@@ -12,6 +12,8 @@ import { generateStarter } from "#test/test-utils/game-manager-utils";
 import { GameManagerHelper } from "#test/test-utils/helpers/game-manager-helper";
 import { copyChallenge } from "data/challenge";
 
+type challengeStub = { id: Challenges; value: number; severity: number };
+
 /**
  * Helper to handle Challenge mode specifics
  */
@@ -33,8 +35,9 @@ export class ChallengeModeHelper extends GameManagerHelper {
    * Runs the Challenge game to the summon phase.
    * @param gameMode - Optional game mode to set.
    * @returns A promise that resolves when the summon phase is reached.
+   * @todo this duplicates nearly all its code with the classic mode variant...
    */
-  async runToSummon(species?: SpeciesId[]) {
+  private async runToSummon(species?: SpeciesId[]) {
     await this.game.runToTitle();
 
     if (this.game.override.disableShinies) {
@@ -88,4 +91,26 @@ export class ChallengeModeHelper extends GameManagerHelper {
     await this.game.phaseInterceptor.to(CommandPhase);
     console.log("==================[New Turn]==================");
   }
+
+  /**
+   * Override an already-started game with the given challenges.
+   * @param id - The challenge id
+   * @param value - The challenge value
+   * @param severity - The challenge severity
+   * @todo Make severity optional for challenges that do not require it
+   */
+  public overrideGameWithChallenges(id: Challenges, value: number, severity: number): void;
+  /**
+   * Override an already-started game with the given challenges.
+   * @param challenges - One or more challenges to set.
+   */
+  public overrideGameWithChallenges(challenges: challengeStub[]): void;
+  public overrideGameWithChallenges(challenges: challengeStub[] | Challenges, value?: number, severity?: number): void {
+    if (typeof challenges !== "object") {
+      challenges = [{ id: challenges, value: value!, severity: severity! }];
+    }
+    for (const challenge of challenges) {
+      this.game.scene.gameMode.setChallengeValue(challenge.id, challenge.value, challenge.severity);
+    }
+  }
 }

test/test-utils/helpers/daily-mode-helper.ts

@@ -18,7 +18,7 @@ export class DailyModeHelper extends GameManagerHelper {
    * @returns A promise that resolves when the summon phase is reached.
    * @remarks Please do not use for starting normal battles - use {@linkcode startBattle} instead
    */
-  async runToSummon(): Promise<void> {
+  private async runToSummon(): Promise<void> {
     await this.game.runToTitle();
 
     if (this.game.override.disableShinies) {