Merge d49d49f9bc into 10e0f9f0de

Merge main to beta

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "pokemon-rogue-battle",
-	"version": "1.4.0",
+	"version": "1.4.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "pokemon-rogue-battle",
-			"version": "1.4.0",
+			"version": "1.4.1",
 			"hasInstallScript": true,
 			"dependencies": {
 				"@material/material-color-utilities": "^0.2.7",

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "pokemon-rogue-battle",
 	"private": true,
-	"version": "1.4.0",
+	"version": "1.4.1",
 	"type": "module",
 	"scripts": {
 		"start": "vite",

src/data/move.ts

@@ -36,6 +36,7 @@ import { SwitchPhase } from "#app/phases/switch-phase";
 import { SwitchSummonPhase } from "#app/phases/switch-summon-phase";
 import { ShowAbilityPhase } from "#app/phases/show-ability-phase";
 import { SpeciesFormChangeRevertWeatherFormTrigger } from "./pokemon-forms";
+import { ModifierTier } from "#app/modifier/modifier-tier";
 import { GameMode } from "#app/game-mode";
 import { applyChallenges, ChallengeType } from "./challenge";
 import { SwitchType } from "#enums/switch-type";
@@ -7855,6 +7856,91 @@ export class ResistLastMoveTypeAttr extends MoveEffectAttr {
   }
 }
 
+/**
+ * Attribute used for transferring items between a user Pokemon and target Pokemon
+ */
+export class SwapHeldItemsAttr extends MoveEffectAttr {
+  /**
+   * A random item is taken from user and given to target, and a random item is taken from target and given to user
+   * @param {Pokemon} user Pokemon that used the move
+   * @param {Pokemon} target Enemy Pokemon
+   * @param {Move} move Unused
+   * @param {any[]} args Unused
+   * @returns {boolean} Returns true if an item swap occured, false if not
+   */
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+
+    const targetHeldItems = target.getHeldItems().filter(i => i.isTransferable);
+    const userHeldItems = user.getHeldItems().filter(i => i.isTransferable);
+
+    if (!user.hasTrainer() || target.hasAbility(Abilities.STICKY_HOLD) || (!userHeldItems.length && !targetHeldItems.length)) {
+      user.scene.queueMessage(i18next.t("battle:attackFailed"));
+      return false;
+    }
+
+    user.scene.queueMessage(i18next.t("moveTriggers:trickOnSwap", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(user),
+    }));
+
+    if (targetHeldItems.length) {
+      let swapItemIdx = 0;
+      const targetPool = target.isPlayer() ? ModifierPoolType.PLAYER : ModifierPoolType.TRAINER;
+
+      for (let idx = 1; idx < targetHeldItems.length; idx++) {
+        const currentItemFlameOrToxic = targetHeldItems[swapItemIdx].type.id === "TOXIC_ORB" || targetHeldItems[swapItemIdx].type.id === "FLAME_ORB";
+        const nextItemNotFlameOrToxic = targetHeldItems[idx].type.id !== "TOXIC_ORB" && targetHeldItems[idx].type.id !== "FLAME_ORB";
+        let nextItemTier = targetHeldItems[idx].type.getOrInferTier(targetPool);
+        let currentItemTier = targetHeldItems[swapItemIdx].type.getOrInferTier(targetPool);
+        nextItemTier = nextItemTier !== null ? nextItemTier : ModifierTier.COMMON;
+        currentItemTier = currentItemTier !== null ? currentItemTier : ModifierTier.COMMON;
+
+        if (nextItemNotFlameOrToxic && (nextItemTier > currentItemTier || currentItemFlameOrToxic)) {
+          swapItemIdx = idx;
+        }
+
+        if (targetHeldItems[swapItemIdx].type.tier === ModifierTier.LUXURY) {
+          break;
+        }
+      }
+      user.scene.tryTransferHeldItemModifier(targetHeldItems[swapItemIdx], user, false);
+    }
+
+    if (userHeldItems.length) {
+      let swapItemIdx = 0;
+      const userPool = user.isPlayer() ? ModifierPoolType.PLAYER : ModifierPoolType.TRAINER;
+
+      for (let idx = 1; idx < userHeldItems.length; idx++) {
+        if (userHeldItems[swapItemIdx].type.id === "TOXIC_ORB" || userHeldItems[swapItemIdx].type.id === "FLAME_ORB") {
+          break;
+        }
+
+        if (userHeldItems[idx].type.id === "TOXIC_ORB" || userHeldItems[idx].type.id === "FLAME_ORB") {
+          swapItemIdx = idx;
+          break;
+        }
+
+        let nextItemTier = userHeldItems[idx].type.getOrInferTier(userPool);
+        let currentItemTier = userHeldItems[swapItemIdx].type.getOrInferTier(userPool);
+        nextItemTier = nextItemTier !== null ? nextItemTier : ModifierTier.COMMON;
+        currentItemTier = currentItemTier !== null ? currentItemTier : ModifierTier.COMMON;
+
+        if (nextItemTier < currentItemTier) {
+          swapItemIdx = idx;
+        }
+      }
+
+      const swappedItemName = userHeldItems[swapItemIdx].type.name;
+      target.scene.tryTransferHeldItemModifier(userHeldItems[swapItemIdx], target, false);
+
+      user.scene.queueMessage(i18next.t("moveTriggers:trickFoeNewItem", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(target),
+        itemName: swappedItemName,
+      }));
+    }
+    return true;
+  }
+}
+
 /**
  * Drops the target's immunity to types it is immune to
  * and makes its evasiveness be ignored during accuracy
@@ -7887,7 +7973,6 @@ export class ExposedMoveAttr extends AddBattlerTagAttr {
   }
 }
 
-
 const unknownTypeCondition: MoveConditionFunc = (user, target, move) => !user.getTypes().includes(Type.UNKNOWN);
 
 export type MoveTargetSet = {
@@ -8764,7 +8849,7 @@ export function initMoves() {
       .target(MoveTarget.NEAR_ALLY)
       .condition(failIfSingleBattle),
     new StatusMove(Moves.TRICK, Type.PSYCHIC, 100, 10, -1, 0, 3)
-      .unimplemented(),
+      .attr(SwapHeldItemsAttr),
     new StatusMove(Moves.ROLE_PLAY, Type.PSYCHIC, -1, 10, -1, 0, 3)
       .ignoresSubstitute()
       .attr(AbilityCopyAttr),

src/data/mystery-encounters/encounters/berries-abound-encounter.ts

@@ -31,7 +31,7 @@ import { BerryType } from "#enums/berry-type";
 import { PERMANENT_STATS, Stat } from "#enums/stat";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
-import PokemonSpecies, { allSpecies } from "#app/data/pokemon-species";
+import PokemonSpecies, { getPokemonSpecies } from "#app/data/pokemon-species";
 
 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounters/berriesAbound";
@@ -62,8 +62,8 @@ export const BerriesAboundEncounter: MysteryEncounter =
       let bossSpecies: PokemonSpecies;
       if (scene.eventManager.isEventActive() && scene.eventManager.activeEvent()?.uncommonBreedEncounters && randSeedInt(2) === 1) {
         const eventEncounter = randSeedItem(scene.eventManager.activeEvent()!.uncommonBreedEncounters!);
-        bossSpecies = allSpecies[eventEncounter.species];
+        const levelSpecies = getPokemonSpecies(eventEncounter.species).getWildSpeciesForLevel(level, eventEncounter.allowEvolution ?? false, true, scene.gameMode);
-        bossSpecies.speciesId = bossSpecies.getSpeciesForLevel(level, eventEncounter.allowEvolution);
+        bossSpecies = getPokemonSpecies( levelSpecies );
       } else {
         bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getPlayerParty()), true);
       }

src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts

@@ -29,7 +29,7 @@ import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encoun
 import { randSeedInt, randSeedItem } from "#app/utils";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
-import PokemonSpecies, { allSpecies } from "#app/data/pokemon-species";
+import PokemonSpecies, { getPokemonSpecies } from "#app/data/pokemon-species";
 
 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounters/fightOrFlight";
@@ -60,8 +60,8 @@ export const FightOrFlightEncounter: MysteryEncounter =
       let bossSpecies: PokemonSpecies;
       if (scene.eventManager.isEventActive() && scene.eventManager.activeEvent()?.uncommonBreedEncounters && randSeedInt(2) === 1) {
         const eventEncounter = randSeedItem(scene.eventManager.activeEvent()!.uncommonBreedEncounters!);
-        bossSpecies = allSpecies[eventEncounter.species];
+        const levelSpecies = getPokemonSpecies(eventEncounter.species).getWildSpeciesForLevel(level, eventEncounter.allowEvolution ?? false, true, scene.gameMode);
-        bossSpecies.speciesId = bossSpecies.getSpeciesForLevel(level, eventEncounter.allowEvolution);
+        bossSpecies = getPokemonSpecies( levelSpecies );
       } else {
         bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getPlayerParty()), true);
       }

src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts

@@ -23,7 +23,7 @@ import { BerryModifier } from "#app/modifier/modifier";
 import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
 import { Stat } from "#enums/stat";
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
-import PokemonSpecies, { allSpecies } from "#app/data/pokemon-species";
+import PokemonSpecies, { getPokemonSpecies } from "#app/data/pokemon-species";
 
 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounters/uncommonBreed";
@@ -55,8 +55,8 @@ export const UncommonBreedEncounter: MysteryEncounter =
       let species: PokemonSpecies;
       if (scene.eventManager.isEventActive() && scene.eventManager.activeEvent()?.uncommonBreedEncounters && randSeedInt(2) === 1) {
         const eventEncounter = randSeedItem(scene.eventManager.activeEvent()!.uncommonBreedEncounters!);
-        species = allSpecies[eventEncounter.species];
+        const levelSpecies = getPokemonSpecies(eventEncounter.species).getWildSpeciesForLevel(level, eventEncounter.allowEvolution ?? false, true, scene.gameMode);
-        species.speciesId = species.getSpeciesForLevel(level, eventEncounter.allowEvolution);
+        species = getPokemonSpecies( levelSpecies );
       } else {
         species = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getPlayerParty()), true);
       }

src/test/moves/trick.test.ts

@@ -0,0 +1,254 @@
+import GameManager from "#app/test/utils/gameManager";
+import Phaser from "phaser";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { PokemonHeldItemModifier } from "#app/modifier/modifier.js";
+import { deepCopy } from "#app/utils";
+import { Abilities } from "#app/enums/abilities.js";
+
+const TIMEOUT = 20000;
+const TRICK_ONLY = [Moves.TRICK, Moves.TRICK, Moves.TRICK, Moves.TRICK];
+const SPLASH_ONLY = [Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH];
+
+/**
+ * Gets the PokemonHeldItemModifier for a given item ID, if the Pokemon has that item
+ * @param {PokemonHeldItemModifier[]} inventory Held items of a Pokemon
+ * @param {string} itemId The ID of the item to search for
+ * @returns PokemonHeldItemModifier if the item is found, undefined if not
+ */
+function getHeldItemModifierFromId(inventory: PokemonHeldItemModifier[], itemId: string) {
+  let idxOfSearchedItem = -1;
+  for (let idx = 0; idx < inventory.length; idx++) {
+    if (inventory[idx].type.id === itemId) {
+      idxOfSearchedItem = idx;
+      break;
+    }
+  }
+  return idxOfSearchedItem !== -1 ? inventory[idxOfSearchedItem] : undefined;
+}
+
+/**
+ * Prints a string to the console showing how many of an item a Pokemon currently has
+ * @param {string} pokemonName The name of the checked Pokemon
+ * @param {string} itemId The ID of the checked item
+ * @param {number} stackCount How many of this item ID the checked Pokemon has
+ */
+function printStackCount(pokemonName: string, itemId: string, stackCount: number) {
+  console.log(`${pokemonName} has ${stackCount} of ${itemId}`);
+}
+
+describe("Moves - Trick", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override.battleType("single");
+  });
+
+  it(
+    "both pokemon have two items, they will always swap Leftovers and Golden Punch, due to the priority system",
+    async () => {
+      game.override.startingHeldItems([{name: "MULTI_LENS"}, {name: "GOLDEN_PUNCH"}]);
+      game.override.enemyHeldItems([{name: "LEFTOVERS"}, {name: "GOLDEN_PUNCH"}]);
+      game.override.moveset(TRICK_ONLY);
+      game.override.enemySpecies(Species.MAGIKARP);
+      game.override.enemyMoveset(SPLASH_ONLY);
+      await game.startBattle([Species.MIME_JR]);
+
+      const playerPokemon = game.scene.getPlayerPokemon()!;
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      const playerLostItem = playerPokemon.getHeldItems()[1];
+      const enemyLostItem = enemyPokemon.getHeldItems()[0];
+      const prevPlayerLostItemStack = playerLostItem.stackCount;
+      const prevEnemyLostItemStack = enemyLostItem.stackCount;
+      const prevPlayerGainedItemModifier = getHeldItemModifierFromId(playerPokemon.getHeldItems(), enemyLostItem.type.id);
+      const prevEnemyGainedItemModifier = getHeldItemModifierFromId(enemyPokemon.getHeldItems(), playerLostItem.type.id);
+
+      let prevPlayerGainedItemStackCount = 0;
+      let prevEnemyGainedItemStackCount = 0;
+
+      if (prevPlayerGainedItemModifier !== undefined) {
+        prevPlayerGainedItemStackCount = prevPlayerGainedItemModifier.stackCount;
+      }
+
+      if (prevEnemyGainedItemModifier !== undefined) {
+        prevEnemyGainedItemStackCount = prevEnemyGainedItemModifier.stackCount;
+      }
+
+      printStackCount(playerPokemon.name, playerLostItem.type.id, prevPlayerLostItemStack);
+      printStackCount(playerPokemon.name, enemyLostItem.type.id, prevPlayerGainedItemStackCount);
+      printStackCount(enemyPokemon.name, enemyLostItem.type.id, prevEnemyLostItemStack);
+      printStackCount(enemyPokemon.name, playerLostItem.type.id, prevEnemyGainedItemStackCount);
+
+      game.move.select(Moves.TRICK);
+      await game.phaseInterceptor.to(TurnEndPhase);
+
+      const currPlayerLostItemStack = playerLostItem.stackCount;
+      const currEnemyLostItemStack = enemyLostItem.stackCount;
+      const currPlayerGainedItemModifier = getHeldItemModifierFromId(playerPokemon.getHeldItems(), enemyLostItem.type.id);
+      const currEnemyGainedItemModifier = getHeldItemModifierFromId(enemyPokemon.getHeldItems(), playerLostItem.type.id);
+
+      expect(currPlayerGainedItemModifier).toBeDefined();
+      expect(currEnemyGainedItemModifier).toBeDefined();
+
+      if (currPlayerGainedItemModifier && currEnemyGainedItemModifier) {
+
+        const currPlayerGainedItemStackCount = currPlayerGainedItemModifier.stackCount;
+        const currEnemyGainedItemStackCount = currEnemyGainedItemModifier.stackCount;
+
+        printStackCount(playerPokemon.name, playerLostItem.type.id, currPlayerLostItemStack);
+        printStackCount(playerPokemon.name, enemyLostItem.type.id, currPlayerGainedItemStackCount);
+        printStackCount(enemyPokemon.name, enemyLostItem.type.id, currEnemyLostItemStack);
+        printStackCount(enemyPokemon.name, playerLostItem.type.id, currEnemyGainedItemStackCount);
+
+        const didPlayerTransferItems = prevPlayerLostItemStack > currPlayerLostItemStack && prevPlayerGainedItemStackCount < currPlayerGainedItemStackCount;
+        const didEnemyTransferItems = prevEnemyLostItemStack > currEnemyLostItemStack && prevEnemyGainedItemStackCount < currEnemyGainedItemStackCount;
+        const playerReceivedLeftovers = currPlayerGainedItemModifier.type.id === "LEFTOVERS";
+        const enemyReceivedGoldenPunch = currEnemyGainedItemModifier.type.id === "GOLDEN_PUNCH";
+
+        expect(didPlayerTransferItems && didEnemyTransferItems && playerReceivedLeftovers && enemyReceivedGoldenPunch).toBeTruthy();
+      }
+    }, TIMEOUT
+  );
+
+  it(
+    "the user will always give Toxic Orb, as it has special priority to be given",
+    async () => {
+      game.override.startingHeldItems([{name: "GOLDEN_PUNCH"}, {name: "TOXIC_ORB"}]);
+      game.override.enemyHeldItems([{name: "LEFTOVERS"}, {name: "GOLDEN_PUNCH"}]);
+      game.override.moveset(TRICK_ONLY);
+      game.override.enemySpecies(Species.MAGIKARP);
+      game.override.enemyMoveset(SPLASH_ONLY);
+      await game.startBattle([Species.MIME_JR]);
+
+      game.move.select(Moves.TRICK);
+      await game.phaseInterceptor.to(TurnEndPhase);
+
+      const playerPokemon = game.scene.getPlayerPokemon()!;
+      expect(playerPokemon.getHeldItems()[1].type.id === "TOXIC_ORB").toBeFalsy();
+    }
+  );
+
+  it(
+    "the user will never take Flame Orb, as it has special priority to not be taken",
+    async () => {
+      game.override.enemyHeldItems([{name: "FLAME_ORB"}, {name: "GOLDEN_PUNCH"}]);
+      game.override.moveset(TRICK_ONLY);
+      game.override.enemySpecies(Species.MAGIKARP);
+      game.override.enemyMoveset(SPLASH_ONLY);
+      await game.startBattle([Species.MIME_JR]);
+
+      game.move.select(Moves.TRICK);
+      await game.phaseInterceptor.to(TurnEndPhase);
+
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+      expect(enemyPokemon.getHeldItems()[0].type.id === "FLAME_ORB").toBeTruthy();
+    }
+  );
+
+  it(
+    "the move fails and no transfer occurs when a wild pokemon is the user",
+    async () => {
+      game.override.startingHeldItems([{name: "GOLDEN_PUNCH"}]);
+      game.override.enemyHeldItems([{name: "LEFTOVERS"}]);
+      game.override.moveset(SPLASH_ONLY);
+      game.override.enemySpecies(Species.MIME_JR);
+      game.override.enemyMoveset(TRICK_ONLY);
+      await game.startBattle([Species.MAGIKARP]);
+
+      const playerPokemon = game.scene.getPlayerPokemon()!;
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+      const playerPokemonFirstHeldItem = deepCopy(playerPokemon.getHeldItems()[0]) as PokemonHeldItemModifier;
+      const enemyPokemonFirstHeldItem = deepCopy(enemyPokemon.getHeldItems()[0]) as PokemonHeldItemModifier;
+
+      printStackCount(playerPokemon.name, playerPokemonFirstHeldItem.type.id, playerPokemonFirstHeldItem.stackCount);
+      printStackCount(enemyPokemon.name, enemyPokemonFirstHeldItem.type.id, enemyPokemonFirstHeldItem.stackCount);
+
+      game.move.select(Moves.TRICK);
+      await game.phaseInterceptor.to(TurnEndPhase);
+
+      const playerPokemonCurrentHeldItem = playerPokemon.getHeldItems()[0];
+      const enemyPokemonCurrentHeldItem = enemyPokemon.getHeldItems()[0];
+
+      printStackCount(playerPokemon.name, playerPokemonFirstHeldItem.type.id, playerPokemonFirstHeldItem.stackCount);
+      printStackCount(enemyPokemon.name, enemyPokemonFirstHeldItem.type.id, enemyPokemonFirstHeldItem.stackCount);
+
+      const playerDidNotLoseItem = playerPokemonFirstHeldItem.type.id === playerPokemonCurrentHeldItem.type.id && playerPokemonFirstHeldItem.stackCount === playerPokemonCurrentHeldItem.stackCount;
+      const enemyDidNotLoseItem = enemyPokemonFirstHeldItem.type.id === enemyPokemonCurrentHeldItem.type.id && enemyPokemonFirstHeldItem.stackCount === enemyPokemonCurrentHeldItem.stackCount;
+
+      expect(playerDidNotLoseItem && enemyDidNotLoseItem).toBeTruthy();
+    }, TIMEOUT
+  );
+
+  it(
+    "the move fails and no transfer occurs when the target pokemon has sticky hold",
+    async () => {
+      game.override.startingHeldItems([{name: "GOLDEN_PUNCH"}]);
+      game.override.enemyHeldItems([{name: "LEFTOVERS"}]);
+      game.override.moveset(TRICK_ONLY);
+      game.override.enemySpecies(Species.MAGIKARP);
+      game.override.enemyMoveset(SPLASH_ONLY);
+      game.override.enemyAbility(Abilities.STICKY_HOLD);
+      await game.startBattle([Species.MIME_JR]);
+
+      const playerPokemon = game.scene.getPlayerPokemon()!;
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+      const playerPokemonFirstHeldItem = deepCopy(playerPokemon.getHeldItems()[0]) as PokemonHeldItemModifier;
+      const enemyPokemonFirstHeldItem = deepCopy(enemyPokemon.getHeldItems()[0]) as PokemonHeldItemModifier;
+
+      printStackCount(playerPokemon.name, playerPokemonFirstHeldItem.type.id, playerPokemonFirstHeldItem.stackCount);
+      printStackCount(enemyPokemon.name, enemyPokemonFirstHeldItem.type.id, enemyPokemonFirstHeldItem.stackCount);
+
+      game.move.select(Moves.TRICK);
+      await game.phaseInterceptor.to(TurnEndPhase);
+
+      const playerPokemonCurrentHeldItem = playerPokemon.getHeldItems()[0];
+      const enemyPokemonCurrentHeldItem = enemyPokemon.getHeldItems()[0];
+
+      printStackCount(playerPokemon.name, playerPokemonFirstHeldItem.type.id, playerPokemonFirstHeldItem.stackCount);
+      printStackCount(enemyPokemon.name, enemyPokemonFirstHeldItem.type.id, enemyPokemonFirstHeldItem.stackCount);
+
+      const playerDidNotLoseItem = playerPokemonFirstHeldItem.type.id === playerPokemonCurrentHeldItem.type.id && playerPokemonFirstHeldItem.stackCount === playerPokemonCurrentHeldItem.stackCount;
+      const enemyDidNotLoseItem = enemyPokemonFirstHeldItem.type.id === enemyPokemonCurrentHeldItem.type.id && enemyPokemonFirstHeldItem.stackCount === enemyPokemonCurrentHeldItem.stackCount;
+
+      expect(playerDidNotLoseItem && enemyDidNotLoseItem).toBeTruthy();
+    }, TIMEOUT
+  );
+
+  it(
+    "the move fails and no transfer occurs when neither pokemon have any items",
+    async() => {
+      game.override.moveset(TRICK_ONLY);
+      game.override.enemySpecies(Species.MAGIKARP);
+      game.override.enemyMoveset(SPLASH_ONLY);
+      await game.startBattle([Species.MIME_JR]);
+
+      const playerPokemon = game.scene.getPlayerPokemon()!;
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      expect(playerPokemon.getHeldItems().length === 0);
+      expect(enemyPokemon.getHeldItems().length === 0);
+
+      game.move.select(Moves.TRICK);
+      await game.phaseInterceptor.to(TurnEndPhase);
+
+      expect(playerPokemon.getHeldItems().length === 0);
+      expect(enemyPokemon.getHeldItems().length === 0);
+
+    }, TIMEOUT
+  );
+});