Merge 216018b409 into 79576ad117

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)
     );
   }
 }
@@ -4190,71 +4188,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 +7055,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,
@@ -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));
@@ -1795,7 +1795,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 +1833,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 +1875,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 +5349,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 +5910,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;
@@ -8146,7 +8140,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))) {
@@ -8417,8 +8413,7 @@ const MoveAttrs = Object.freeze({
   TeraStarstormTypeAttr,
   MatchUserTypeAttr,
   CombinedPledgeTypeAttr,
-  VariableMoveTypeMultiplierAttr,
-  NeutralDamageAgainstFlyingTypeMultiplierAttr,
+  NeutralDamageAgainstFlyingTypeAttr,
   IceNoEffectTypeAttr,
   FlyingTypeMultiplierAttr,
   VariableMoveTypeChartAttr,
@@ -10454,7 +10449,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)
@@ -11390,9 +11385,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

@@ -129,7 +129,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";
@@ -204,6 +205,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},
@@ -2396,11 +2429,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;
     }
@@ -2460,26 +2492,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;
 
@@ -2492,57 +2529,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;
   }
 
   /**
@@ -2562,10 +2621,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;
@@ -2579,7 +2643,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

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/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/moves/flying-press.test.ts

@@ -0,0 +1,122 @@
+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 { 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;
+
+  beforeAll(async () => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+
+    game = new GameManager(phaserGame);
+    game.override
+      .ability(AbilityId.BALL_FETCH)
+      .battleStyle("single")
+      .criticalHits(false)
+      .enemySpecies(SpeciesId.MAGIKARP)
+      .enemyAbility(AbilityId.BALL_FETCH)
+      .enemyMoveset(MoveId.SPLASH)
+      .startingLevel(100)
+      .enemyLevel(100);
+
+    await game.classicMode.startBattle([SpeciesId.HAWLUCHA]);
+    hawlucha = game.field.getPlayerPokemon();
+  });
+
+  afterAll(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  // Reset temporary summon data overrides to reset effects
+  afterEach(() => {
+    hawlucha.resetSummonData();
+    expect(hawlucha).not.toHaveBattlerTag(BattlerTagType.ELECTRIFIED);
+    expect(hawlucha.hasAbility(AbilityId.NORMALIZE)).toBe(false);
+  });
+
+  const pokemonTypes = getEnumValues(PokemonType);
+
+  function checkEffForAllTypes(primaryType: PokemonType) {
+    const enemy = game.field.getEnemyPokemon();
+    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);
+    });
+  });
+
+  describe("Inverse", () => {
+    beforeAll(() => {
+      game.challengeMode.addChallenge(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 2x to Wonder Guard Shedinja under Electrify", () => {
+    const enemy = game.field.getEnemyPokemon();
+    game.field.mockAbility(enemy, AbilityId.WONDER_GUARD);
+    enemy.resetSummonData();
+
+    hawlucha.addTag(BattlerTagType.ELECTRIFIED);
+
+    const flyingPressEff = enemy.getAttackTypeEffectiveness(hawlucha.getMoveType(allMoves[MoveId.FLYING_PRESS]), {
+      source: hawlucha,
+      move: allMoves[MoveId.FLYING_PRESS],
+    });
+    expect(flyingPressEff).toBe(2);
+  });
+});