Merge branch 'beta' into is-player

src/ui/fight-ui-handler.ts

@@ -292,7 +292,7 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
     this.accuracyText.setVisible(hasMove);
     this.moveCategoryIcon.setVisible(hasMove);
 
-    this.cursorObj.setPosition(13 + (cursor % 2 === 1 ? 100 : 0), -31 + (cursor >= 2 ? 15 : 0));
+    this.cursorObj.setPosition(13 + (cursor % 2 === 1 ? 114 : 0), -31 + (cursor >= 2 ? 15 : 0));
 
     return changed;
   }
@@ -322,7 +322,7 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
     const moveset = pokemon.getMoveset();
 
     for (let moveIndex = 0; moveIndex < 4; moveIndex++) {
-      const moveText = addTextObject(moveIndex % 2 === 0 ? 0 : 100, moveIndex < 2 ? 0 : 16, "-", TextStyle.WINDOW);
+      const moveText = addTextObject(moveIndex % 2 === 0 ? 0 : 114, moveIndex < 2 ? 0 : 16, "-", TextStyle.WINDOW);
       moveText.setName("text-empty-move");
 
       if (moveIndex < moveset.length) {

test/abilities/aura_break.test.ts

@@ -24,11 +24,12 @@ describe("Abilities - Aura Break", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleStyle("single");
+    game.override
-    game.override.moveset([Moves.MOONBLAST, Moves.DARK_PULSE, Moves.MOONBLAST, Moves.DARK_PULSE]);
+      .battleStyle("single")
-    game.override.enemyMoveset(Moves.SPLASH);
+      .moveset([Moves.MOONBLAST, Moves.DARK_PULSE])
-    game.override.enemyAbility(Abilities.AURA_BREAK);
+      .enemyMoveset(Moves.SPLASH)
-    game.override.enemySpecies(Species.SHUCKLE);
+      .enemyAbility(Abilities.AURA_BREAK)
+      .enemySpecies(Species.SHUCKLE);
   });
 
   it("reverses the effect of Fairy Aura", async () => {

test/abilities/contrary.test.ts

@@ -54,10 +54,7 @@ describe("Abilities - Contrary", () => {
     });
 
     it("should block negative effects", async () => {
-      game.override
+      game.override.enemyPassiveAbility(Abilities.CLEAR_BODY).enemyMoveset(Moves.HOWL).moveset([Moves.SPLASH]);
-        .enemyPassiveAbility(Abilities.CLEAR_BODY)
-        .enemyMoveset([Moves.HOWL, Moves.HOWL, Moves.HOWL, Moves.HOWL])
-        .moveset([Moves.SPLASH]);
       await game.classicMode.startBattle([Species.SLOWBRO]);
 
       const enemyPokemon = game.scene.getEnemyPokemon()!;

test/abilities/ice_face.test.ts

@@ -106,8 +106,7 @@ describe("Abilities - Ice Face", () => {
   });
 
   it("transforms to Ice Face when Hail or Snow starts", async () => {
-    game.override.moveset([Moves.QUICK_ATTACK]);
+    game.override.moveset([Moves.QUICK_ATTACK]).enemyMoveset(Moves.HAIL);
-    game.override.enemyMoveset([Moves.HAIL, Moves.HAIL, Moves.HAIL, Moves.HAIL]);
 
     await game.classicMode.startBattle([Species.MAGIKARP]);
 
@@ -128,8 +127,7 @@ describe("Abilities - Ice Face", () => {
   });
 
   it("transforms to Ice Face when summoned on arena with active Snow or Hail", async () => {
-    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
+    game.override.enemyMoveset(Moves.TACKLE).moveset([Moves.SNOWSCAPE]);
-    game.override.moveset([Moves.SNOWSCAPE]);
 
     await game.classicMode.startBattle([Species.EISCUE, Species.NINJASK]);
 
@@ -155,8 +153,7 @@ describe("Abilities - Ice Face", () => {
   });
 
   it("will not revert to its Ice Face if there is already Hail when it changes into Noice", async () => {
-    game.override.enemySpecies(Species.SHUCKLE);
+    game.override.enemySpecies(Species.SHUCKLE).enemyMoveset(Moves.TACKLE);
-    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
 
     await game.classicMode.startBattle([Species.EISCUE]);
 
@@ -175,7 +172,7 @@ describe("Abilities - Ice Face", () => {
   });
 
   it("persists form change when switched out", async () => {
-    game.override.enemyMoveset([Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK]);
+    game.override.enemyMoveset(Moves.QUICK_ATTACK);
 
     await game.classicMode.startBattle([Species.EISCUE, Species.MAGIKARP]);
 

test/abilities/libero.test.ts

@@ -29,11 +29,12 @@ describe("Abilities - Libero", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleStyle("single");
+    game.override
-    game.override.ability(Abilities.LIBERO);
+      .battleStyle("single")
-    game.override.startingLevel(100);
+      .ability(Abilities.LIBERO)
-    game.override.enemySpecies(Species.RATTATA);
+      .startingLevel(100)
-    game.override.enemyMoveset([Moves.ENDURE, Moves.ENDURE, Moves.ENDURE, Moves.ENDURE]);
+      .enemySpecies(Species.RATTATA)
+      .enemyMoveset(Moves.ENDURE);
   });
 
   test("ability applies and changes a pokemon's type", async () => {
@@ -173,8 +174,7 @@ describe("Abilities - Libero", () => {
   });
 
   test("ability applies correctly even if the pokemon's move is protected against", async () => {
-    game.override.moveset([Moves.TACKLE]);
+    game.override.moveset([Moves.TACKLE]).enemyMoveset(Moves.PROTECT);
-    game.override.enemyMoveset([Moves.PROTECT, Moves.PROTECT, Moves.PROTECT, Moves.PROTECT]);
 
     await game.classicMode.startBattle([Species.MAGIKARP]);
 

test/abilities/mycelium_might.test.ts

@@ -24,13 +24,15 @@ describe("Abilities - Mycelium Might", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleStyle("single");
+    game.override
-    game.override.disableCrits();
+      .battleStyle("single")
-    game.override.enemySpecies(Species.SHUCKLE);
+      .disableCrits()
-    game.override.enemyAbility(Abilities.CLEAR_BODY);
+      .enemySpecies(Species.SHUCKLE)
-    game.override.enemyMoveset([Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK]);
+      .enemyAbility(Abilities.CLEAR_BODY)
-    game.override.ability(Abilities.MYCELIUM_MIGHT);
+
-    game.override.moveset([Moves.QUICK_ATTACK, Moves.BABY_DOLL_EYES]);
+      .enemyMoveset(Moves.QUICK_ATTACK)
+      .ability(Abilities.MYCELIUM_MIGHT)
+      .moveset([Moves.QUICK_ATTACK, Moves.BABY_DOLL_EYES]);
   });
 
   /**
@@ -64,7 +66,7 @@ describe("Abilities - Mycelium Might", () => {
   }, 20000);
 
   it("will still go first if a status move that is in a higher priority bracket than the opponent's move is used", async () => {
-    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
+    game.override.enemyMoveset(Moves.TACKLE);
     await game.classicMode.startBattle([Species.REGIELEKI]);
 
     const enemyPokemon = game.scene.getEnemyPokemon();

test/abilities/power_construct.test.ts

@@ -25,10 +25,11 @@ describe("Abilities - POWER CONSTRUCT", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     const moveToUse = Moves.SPLASH;
-    game.override.battleStyle("single");
+    game.override
-    game.override.ability(Abilities.POWER_CONSTRUCT);
+      .battleStyle("single")
-    game.override.moveset([moveToUse]);
+      .ability(Abilities.POWER_CONSTRUCT)
-    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
+      .moveset([moveToUse])
+      .enemyMoveset(Moves.TACKLE);
   });
 
   test("check if fainted 50% Power Construct Pokemon switches to base form on arena reset", async () => {

test/abilities/protean.test.ts

@@ -29,11 +29,12 @@ describe("Abilities - Protean", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleStyle("single");
+    game.override
-    game.override.ability(Abilities.PROTEAN);
+      .battleStyle("single")
-    game.override.startingLevel(100);
+      .ability(Abilities.PROTEAN)
-    game.override.enemySpecies(Species.RATTATA);
+      .startingLevel(100)
-    game.override.enemyMoveset([Moves.ENDURE, Moves.ENDURE, Moves.ENDURE, Moves.ENDURE]);
+      .enemySpecies(Species.RATTATA)
+      .enemyMoveset(Moves.ENDURE);
   });
 
   test("ability applies and changes a pokemon's type", async () => {
@@ -173,8 +174,7 @@ describe("Abilities - Protean", () => {
   });
 
   test("ability applies correctly even if the pokemon's move is protected against", async () => {
-    game.override.moveset([Moves.TACKLE]);
+    game.override.moveset([Moves.TACKLE]).enemyMoveset(Moves.PROTECT);
-    game.override.enemyMoveset([Moves.PROTECT, Moves.PROTECT, Moves.PROTECT, Moves.PROTECT]);
 
     await game.classicMode.startBattle([Species.MAGIKARP]);
 

test/abilities/sand_veil.test.ts

@@ -28,13 +28,15 @@ describe("Abilities - Sand Veil", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.moveset([Moves.SPLASH]);
+    game.override
-    game.override.enemySpecies(Species.MEOWSCARADA);
+      .moveset([Moves.SPLASH])
-    game.override.enemyAbility(Abilities.INSOMNIA);
+      .enemySpecies(Species.MEOWSCARADA)
-    game.override.enemyMoveset([Moves.TWISTER, Moves.TWISTER, Moves.TWISTER, Moves.TWISTER]);
+      .enemyAbility(Abilities.INSOMNIA)
-    game.override.startingLevel(100);
+      .enemyMoveset(Moves.TWISTER)
-    game.override.enemyLevel(100);
+      .startingLevel(100)
-    game.override.weather(WeatherType.SANDSTORM).battleStyle("double");
+      .enemyLevel(100)
+      .weather(WeatherType.SANDSTORM)
+      .battleStyle("double");
   });
 
   test("ability should increase the evasiveness of the source", async () => {

test/abilities/schooling.test.ts

@@ -25,10 +25,7 @@ describe("Abilities - SCHOOLING", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     const moveToUse = Moves.SPLASH;
-    game.override.battleStyle("single");
+    game.override.battleStyle("single").ability(Abilities.SCHOOLING).moveset([moveToUse]).enemyMoveset(Moves.TACKLE);
-    game.override.ability(Abilities.SCHOOLING);
-    game.override.moveset([moveToUse]);
-    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
   });
 
   test("check if fainted pokemon switches to base form on arena reset", async () => {

test/abilities/screen_cleaner.test.ts

@@ -30,8 +30,7 @@ describe("Abilities - Screen Cleaner", () => {
   });
 
   it("removes Aurora Veil", async () => {
-    game.override.moveset([Moves.HAIL]);
+    game.override.moveset([Moves.HAIL]).enemyMoveset(Moves.AURORA_VEIL);
-    game.override.enemyMoveset([Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL]);
 
     await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]);
 
@@ -48,7 +47,7 @@ describe("Abilities - Screen Cleaner", () => {
   });
 
   it("removes Light Screen", async () => {
-    game.override.enemyMoveset([Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN]);
+    game.override.enemyMoveset(Moves.LIGHT_SCREEN);
 
     await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]);
 
@@ -65,7 +64,7 @@ describe("Abilities - Screen Cleaner", () => {
   });
 
   it("removes Reflect", async () => {
-    game.override.enemyMoveset([Moves.REFLECT, Moves.REFLECT, Moves.REFLECT, Moves.REFLECT]);
+    game.override.enemyMoveset(Moves.REFLECT);
 
     await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]);
 

test/abilities/stall.test.ts

@@ -22,12 +22,13 @@ describe("Abilities - Stall", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleStyle("single");
+    game.override
-    game.override.disableCrits();
+      .battleStyle("single")
-    game.override.enemySpecies(Species.REGIELEKI);
+      .disableCrits()
-    game.override.enemyAbility(Abilities.STALL);
+      .enemySpecies(Species.REGIELEKI)
-    game.override.enemyMoveset([Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK, Moves.QUICK_ATTACK]);
+      .enemyAbility(Abilities.STALL)
-    game.override.moveset([Moves.QUICK_ATTACK, Moves.TACKLE]);
+      .enemyMoveset(Moves.QUICK_ATTACK)
+      .moveset([Moves.QUICK_ATTACK, Moves.TACKLE]);
   });
 
   /**

test/abilities/sweet_veil.test.ts

@@ -25,11 +25,12 @@ describe("Abilities - Sweet Veil", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleStyle("double");
+    game.override
-    game.override.moveset([Moves.SPLASH, Moves.REST, Moves.YAWN]);
+      .battleStyle("double")
-    game.override.enemySpecies(Species.MAGIKARP);
+      .moveset([Moves.SPLASH, Moves.REST, Moves.YAWN])
-    game.override.enemyAbility(Abilities.BALL_FETCH);
+      .enemySpecies(Species.MAGIKARP)
-    game.override.enemyMoveset([Moves.POWDER, Moves.POWDER, Moves.POWDER, Moves.POWDER]);
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.POWDER);
   });
 
   it("prevents the user and its allies from falling asleep", async () => {
@@ -56,7 +57,7 @@ describe("Abilities - Sweet Veil", () => {
   });
 
   it("causes Yawn to fail if used on the user or its allies", async () => {
-    game.override.enemyMoveset([Moves.YAWN, Moves.YAWN, Moves.YAWN, Moves.YAWN]);
+    game.override.enemyMoveset(Moves.YAWN);
     await game.classicMode.startBattle([Species.SWIRLIX, Species.MAGIKARP]);
 
     game.move.select(Moves.SPLASH);

test/abilities/synchronize.test.ts

@@ -66,10 +66,7 @@ describe("Abilities - Synchronize", () => {
   });
 
   it("does not trigger when Pokemon is statused by Toxic Spikes", async () => {
-    game.override
+    game.override.ability(Abilities.SYNCHRONIZE).enemyAbility(Abilities.BALL_FETCH).enemyMoveset(Moves.TOXIC_SPIKES);
-      .ability(Abilities.SYNCHRONIZE)
-      .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset(Array(4).fill(Moves.TOXIC_SPIKES));
 
     await game.classicMode.startBattle([Species.FEEBAS, Species.MILOTIC]);
 

test/abilities/unseen_fist.test.ts

@@ -24,12 +24,13 @@ describe("Abilities - Unseen Fist", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleStyle("single");
+    game.override
-    game.override.starterSpecies(Species.URSHIFU);
+      .battleStyle("single")
-    game.override.enemySpecies(Species.SNORLAX);
+      .starterSpecies(Species.URSHIFU)
-    game.override.enemyMoveset([Moves.PROTECT, Moves.PROTECT, Moves.PROTECT, Moves.PROTECT]);
+      .enemySpecies(Species.SNORLAX)
-    game.override.startingLevel(100);
+      .enemyMoveset(Moves.PROTECT)
-    game.override.enemyLevel(100);
+      .startingLevel(100)
+      .enemyLevel(100);
   });
 
   it("should cause a contact move to ignore Protect", async () =>
@@ -73,8 +74,7 @@ async function testUnseenFistHitResult(
   protectMove: Moves,
   shouldSucceed = true,
 ): Promise<void> {
-  game.override.moveset([attackMove]);
+  game.override.moveset([attackMove]).enemyMoveset(protectMove);
-  game.override.enemyMoveset([protectMove, protectMove, protectMove, protectMove]);
 
   await game.classicMode.startBattle();
 

test/battle/inverse_battle.test.ts

@@ -188,9 +188,7 @@ describe("Inverse Battle", () => {
   });
 
   it("Conversion 2 should change the type to the resistive type - Conversion 2 against Dragonite", async () => {
-    game.override
+    game.override.moveset([Moves.CONVERSION_2]).enemyMoveset(Moves.DRAGON_CLAW);
-      .moveset([Moves.CONVERSION_2])
-      .enemyMoveset([Moves.DRAGON_CLAW, Moves.DRAGON_CLAW, Moves.DRAGON_CLAW, Moves.DRAGON_CLAW]);
 
     await game.challengeMode.startBattle();
 

test/battle/special_battle.test.ts

@@ -23,12 +23,13 @@ describe("Test Battle Phase", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.enemySpecies(Species.RATTATA);
+    game.override
-    game.override.startingLevel(2000);
+      .enemySpecies(Species.RATTATA)
-    game.override.moveset([Moves.TACKLE]);
+      .startingLevel(2000)
-    game.override.enemyAbility(Abilities.HYDRATION);
+      .moveset([Moves.TACKLE])
-    game.override.ability(Abilities.HYDRATION);
+      .enemyAbility(Abilities.HYDRATION)
-    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
+      .ability(Abilities.HYDRATION)
+      .enemyMoveset(Moves.TACKLE);
   });
 
   it("startBattle 2vs1 boss", async () => {

test/items/leek.test.ts

@@ -25,7 +25,7 @@ describe("Items - Leek", () => {
 
     game.override
       .enemySpecies(Species.MAGIKARP)
-      .enemyMoveset([Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH])
+      .enemyMoveset(Moves.SPLASH)
       .startingHeldItems([{ name: "LEEK" }])
       .moveset([Moves.TACKLE])
       .battleStyle("single");

test/items/leftovers.test.ts

@@ -23,14 +23,15 @@ describe("Items - Leftovers", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleStyle("single");
+    game.override
-    game.override.startingLevel(2000);
+      .battleStyle("single")
-    game.override.ability(Abilities.UNNERVE);
+      .startingLevel(2000)
-    game.override.moveset([Moves.SPLASH]);
+      .ability(Abilities.UNNERVE)
-    game.override.enemySpecies(Species.SHUCKLE);
+      .moveset([Moves.SPLASH])
-    game.override.enemyAbility(Abilities.UNNERVE);
+      .enemySpecies(Species.SHUCKLE)
-    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
+      .enemyAbility(Abilities.UNNERVE)
-    game.override.startingHeldItems([{ name: "LEFTOVERS", count: 1 }]);
+      .enemyMoveset(Moves.TACKLE)
+      .startingHeldItems([{ name: "LEFTOVERS", count: 1 }]);
   });
 
   it("leftovers works", async () => {

test/moves/astonish.test.ts

@@ -27,13 +27,14 @@ describe("Moves - Astonish", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleStyle("single");
+    game.override
-    game.override.moveset([Moves.ASTONISH, Moves.SPLASH]);
+      .battleStyle("single")
-    game.override.enemySpecies(Species.BLASTOISE);
+      .moveset([Moves.ASTONISH, Moves.SPLASH])
-    game.override.enemyAbility(Abilities.INSOMNIA);
+      .enemySpecies(Species.BLASTOISE)
-    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
+      .enemyAbility(Abilities.INSOMNIA)
-    game.override.startingLevel(100);
+      .enemyMoveset(Moves.TACKLE)
-    game.override.enemyLevel(100);
+      .startingLevel(100)
+      .enemyLevel(100);
 
     vi.spyOn(allMoves[Moves.ASTONISH], "chance", "get").mockReturnValue(100);
   });

test/moves/aurora_veil.test.ts

@@ -36,14 +36,15 @@ describe("Moves - Aurora Veil", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     globalScene = game.scene;
-    game.override.battleStyle("single");
+    game.override
-    game.override.ability(Abilities.NONE);
+      .battleStyle("single")
-    game.override.moveset([Moves.ABSORB, Moves.ROCK_SLIDE, Moves.TACKLE]);
+      .ability(Abilities.BALL_FETCH)
-    game.override.enemyLevel(100);
+      .moveset([Moves.ABSORB, Moves.ROCK_SLIDE, Moves.TACKLE])
-    game.override.enemySpecies(Species.MAGIKARP);
+      .enemyLevel(100)
-    game.override.enemyMoveset([Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL]);
+      .enemySpecies(Species.MAGIKARP)
-    game.override.disableCrits();
+      .enemyMoveset(Moves.AURORA_VEIL)
-    game.override.weather(WeatherType.HAIL);
+      .disableCrits()
+      .weather(WeatherType.HAIL);
   });
 
   it("reduces damage of physical attacks by half in a single battle", async () => {

test/moves/chilly_reception.test.ts

@@ -26,7 +26,7 @@ describe("Moves - Chilly Reception", () => {
     game.override
       .battleStyle("single")
       .moveset([Moves.CHILLY_RECEPTION, Moves.SNOWSCAPE])
-      .enemyMoveset(Array(4).fill(Moves.SPLASH))
+      .enemyMoveset(Moves.SPLASH)
       .enemyAbility(Abilities.BALL_FETCH)
       .ability(Abilities.BALL_FETCH);
   });
@@ -69,10 +69,7 @@ describe("Moves - Chilly Reception", () => {
 
   // enemy uses another move and weather doesn't change
   it("check case - enemy not selecting chilly reception doesn't change weather ", async () => {
-    game.override
+    game.override.battleStyle("single").enemyMoveset([Moves.CHILLY_RECEPTION, Moves.TACKLE]).moveset(Moves.SPLASH);
-      .battleStyle("single")
-      .enemyMoveset([Moves.CHILLY_RECEPTION, Moves.TACKLE])
-      .moveset(Array(4).fill(Moves.SPLASH));
 
     await game.classicMode.startBattle([Species.SLOWKING, Species.MEOWTH]);
 
@@ -87,7 +84,7 @@ describe("Moves - Chilly Reception", () => {
     game.override
       .battleStyle("single")
       .startingWave(8)
-      .enemyMoveset(Array(4).fill(Moves.CHILLY_RECEPTION))
+      .enemyMoveset(Moves.CHILLY_RECEPTION)
       .enemySpecies(Species.MAGIKARP)
       .moveset([Moves.SPLASH, Moves.THUNDERBOLT]);
 

test/moves/double_team.test.ts

@@ -23,13 +23,14 @@ describe("Moves - Double Team", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleStyle("single");
+    game.override
-    game.override.moveset([Moves.DOUBLE_TEAM]);
+      .battleStyle("single")
-    game.override.disableCrits();
+      .moveset([Moves.DOUBLE_TEAM])
-    game.override.ability(Abilities.BALL_FETCH);
+      .disableCrits()
-    game.override.enemySpecies(Species.SHUCKLE);
+      .ability(Abilities.BALL_FETCH)
-    game.override.enemyAbility(Abilities.BALL_FETCH);
+      .enemySpecies(Species.SHUCKLE)
-    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.TACKLE);
   });
 
   it("raises the user's EVA stat stage by 1", async () => {

test/moves/dynamax_cannon.test.ts

@@ -29,8 +29,14 @@ describe("Moves - Dynamax Cannon", () => {
     dynamaxCannon = allMoves[Moves.DYNAMAX_CANNON];
     game = new GameManager(phaserGame);
 
-    game.override.moveset([dynamaxCannon.id]);
+    game.override
-    game.override.startingLevel(200);
+      .moveset(Moves.DYNAMAX_CANNON)
+      .startingLevel(200)
+      .levelCap(10)
+      .battleStyle("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyMoveset(Moves.SPLASH);
 
     // Note that, for Waves 1-10, the level cap is 10
     game.override.startingWave(1);

test/moves/flower_shield.test.ts

@@ -74,9 +74,7 @@ describe("Moves - Flower Shield", () => {
    * See semi-vulnerable state tags. {@linkcode SemiInvulnerableTag}
    */
   it("does not raise DEF stat stage for a Pokemon in semi-vulnerable state", async () => {
-    game.override.enemySpecies(Species.PARAS);
+    game.override.enemySpecies(Species.PARAS).enemyMoveset(Moves.DIG).enemyLevel(50);
-    game.override.enemyMoveset([Moves.DIG, Moves.DIG, Moves.DIG, Moves.DIG]);
-    game.override.enemyLevel(50);
 
     await game.classicMode.startBattle([Species.CHERRIM]);
     const paras = game.scene.getEnemyPokemon()!;

test/moves/freezy_frost.test.ts

@@ -27,7 +27,7 @@ describe("Moves - Freezy Frost", () => {
       .battleStyle("single")
       .enemySpecies(Species.RATTATA)
       .enemyLevel(100)
-      .enemyMoveset([Moves.HOWL, Moves.HOWL, Moves.HOWL, Moves.HOWL])
+      .enemyMoveset(Moves.HOWL)
       .enemyAbility(Abilities.BALL_FETCH)
       .startingLevel(100)
       .moveset([Moves.FREEZY_FROST, Moves.HOWL, Moves.SPLASH])
@@ -55,7 +55,7 @@ describe("Moves - Freezy Frost", () => {
   });
 
   it("should clear all stat changes even when enemy uses the move", async () => {
-    game.override.enemyMoveset([Moves.FREEZY_FROST, Moves.FREEZY_FROST, Moves.FREEZY_FROST, Moves.FREEZY_FROST]);
+    game.override.enemyMoveset(Moves.FREEZY_FROST);
     await game.classicMode.startBattle([Species.SHUCKLE]); // Shuckle for slower Howl on first turn so Freezy Frost doesn't affect it.
     const user = game.scene.getPlayerPokemon()!;
 

test/moves/fusion_bolt.test.ts

@@ -23,16 +23,15 @@ describe("Moves - Fusion Bolt", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.moveset([fusionBolt]);
+    game.override
-    game.override.startingLevel(1);
+      .moveset([fusionBolt])
-
+      .startingLevel(1)
-    game.override.enemySpecies(Species.RESHIRAM);
+      .enemySpecies(Species.RESHIRAM)
-    game.override.enemyAbility(Abilities.ROUGH_SKIN);
+      .enemyAbility(Abilities.ROUGH_SKIN)
-    game.override.enemyMoveset([Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH]);
+      .enemyMoveset(Moves.SPLASH)
-
+      .battleStyle("single")
-    game.override.battleStyle("single");
+      .startingWave(97)
-    game.override.startingWave(97);
+      .disableCrits();
-    game.override.disableCrits();
   });
 
   it("should not make contact", async () => {

test/moves/fusion_flare.test.ts

@@ -24,15 +24,14 @@ describe("Moves - Fusion Flare", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.moveset([fusionFlare]);
+    game.override
-    game.override.startingLevel(1);
+      .moveset([fusionFlare])
-
+      .startingLevel(1)
-    game.override.enemySpecies(Species.RATTATA);
+      .enemySpecies(Species.RATTATA)
-    game.override.enemyMoveset([Moves.REST, Moves.REST, Moves.REST, Moves.REST]);
+      .enemyMoveset(Moves.REST)
-
+      .battleStyle("single")
-    game.override.battleStyle("single");
+      .startingWave(97)
-    game.override.startingWave(97);
+      .disableCrits();
-    game.override.disableCrits();
   });
 
   it("should thaw freeze status condition", async () => {

test/moves/fusion_flare_bolt.test.ts

@@ -33,15 +33,14 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => {
     fusionFlare = allMoves[Moves.FUSION_FLARE];
     fusionBolt = allMoves[Moves.FUSION_BOLT];
     game = new GameManager(phaserGame);
-    game.override.moveset([fusionFlare.id, fusionBolt.id]);
+    game.override
-    game.override.startingLevel(1);
+      .moveset([fusionFlare.id, fusionBolt.id])
-
+      .startingLevel(1)
-    game.override.enemySpecies(Species.RESHIRAM);
+      .enemySpecies(Species.RESHIRAM)
-    game.override.enemyMoveset([Moves.REST, Moves.REST, Moves.REST, Moves.REST]);
+      .enemyMoveset(Moves.REST)
-
+      .battleStyle("double")
-    game.override.battleStyle("double");
+      .startingWave(97)
-    game.override.startingWave(97);
+      .disableCrits();
-    game.override.disableCrits();
 
     vi.spyOn(fusionFlare, "calculateBattlePower");
     vi.spyOn(fusionBolt, "calculateBattlePower");
@@ -113,7 +112,7 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => {
   }, 20000);
 
   it("FUSION_FLARE should not double power of subsequent FUSION_BOLT if a move succeeded in between", async () => {
-    game.override.enemyMoveset([Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH]);
+    game.override.enemyMoveset(Moves.SPLASH);
     await game.classicMode.startBattle([Species.ZEKROM, Species.ZEKROM]);
 
     game.move.select(fusionFlare.id, 0, BattlerIndex.ENEMY);
@@ -158,7 +157,7 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => {
   }, 20000);
 
   it("FUSION_FLARE and FUSION_BOLT alternating throughout turn should double power of subsequent moves", async () => {
-    game.override.enemyMoveset([fusionFlare.id, fusionFlare.id, fusionFlare.id, fusionFlare.id]);
+    game.override.enemyMoveset(fusionFlare.id);
     await game.classicMode.startBattle([Species.ZEKROM, Species.ZEKROM]);
 
     const party = game.scene.getPlayerParty();
@@ -212,7 +211,7 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => {
   }, 20000);
 
   it("FUSION_FLARE and FUSION_BOLT alternating throughout turn should double power of subsequent moves if moves are aimed at allies", async () => {
-    game.override.enemyMoveset([fusionFlare.id, fusionFlare.id, fusionFlare.id, fusionFlare.id]);
+    game.override.enemyMoveset(fusionFlare.id);
     await game.classicMode.startBattle([Species.ZEKROM, Species.ZEKROM]);
 
     const party = game.scene.getPlayerParty();

test/moves/light_screen.test.ts

@@ -35,13 +35,14 @@ describe("Moves - Light Screen", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     globalScene = game.scene;
-    game.override.battleStyle("single");
+    game.override
-    game.override.ability(Abilities.NONE);
+      .battleStyle("single")
-    game.override.moveset([Moves.ABSORB, Moves.DAZZLING_GLEAM, Moves.TACKLE]);
+      .ability(Abilities.BALL_FETCH)
-    game.override.enemyLevel(100);
+      .moveset([Moves.ABSORB, Moves.DAZZLING_GLEAM, Moves.TACKLE])
-    game.override.enemySpecies(Species.MAGIKARP);
+      .enemyLevel(100)
-    game.override.enemyMoveset([Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN]);
+      .enemySpecies(Species.MAGIKARP)
-    game.override.disableCrits();
+      .enemyMoveset(Moves.LIGHT_SCREEN)
+      .disableCrits();
   });
 
   it("reduces damage of special attacks by half in a single battle", async () => {

test/moves/magnet_rise.test.ts

@@ -23,13 +23,14 @@ describe("Moves - Magnet Rise", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.battleStyle("single");
+    game.override
-    game.override.starterSpecies(Species.MAGNEZONE);
+      .battleStyle("single")
-    game.override.enemySpecies(Species.RATTATA);
+      .starterSpecies(Species.MAGNEZONE)
-    game.override.enemyMoveset([Moves.DRILL_RUN, Moves.DRILL_RUN, Moves.DRILL_RUN, Moves.DRILL_RUN]);
+      .enemySpecies(Species.RATTATA)
-    game.override.disableCrits();
+      .enemyMoveset(Moves.DRILL_RUN)
-    game.override.enemyLevel(1);
+      .disableCrits()
-    game.override.moveset([moveToUse, Moves.SPLASH, Moves.GRAVITY, Moves.BATON_PASS]);
+      .enemyLevel(1)
+      .moveset([moveToUse, Moves.SPLASH, Moves.GRAVITY, Moves.BATON_PASS]);
   });
 
   it("MAGNET RISE", async () => {

test/moves/powder.test.ts

@@ -120,7 +120,7 @@ describe("Moves - Powder", () => {
   });
 
   it("should not prevent the target from thawing out with Flame Wheel", async () => {
-    game.override.enemyMoveset(Array(4).fill(Moves.FLAME_WHEEL)).enemyStatusEffect(StatusEffect.FREEZE);
+    game.override.enemyMoveset(Moves.FLAME_WHEEL).enemyStatusEffect(StatusEffect.FREEZE);
 
     await game.classicMode.startBattle([Species.CHARIZARD]);
 
@@ -198,7 +198,7 @@ describe("Moves - Powder", () => {
   });
 
   it("should cancel Revelation Dance if it becomes a Fire-type move", async () => {
-    game.override.enemySpecies(Species.CHARIZARD).enemyMoveset(Array(4).fill(Moves.REVELATION_DANCE));
+    game.override.enemySpecies(Species.CHARIZARD).enemyMoveset(Moves.REVELATION_DANCE);
 
     await game.classicMode.startBattle([Species.CHARIZARD]);
 
@@ -212,7 +212,7 @@ describe("Moves - Powder", () => {
   });
 
   it("should cancel Shell Trap and damage the target, even if the move would fail", async () => {
-    game.override.enemyMoveset(Array(4).fill(Moves.SHELL_TRAP));
+    game.override.enemyMoveset(Moves.SHELL_TRAP);
 
     await game.classicMode.startBattle([Species.CHARIZARD]);
 

test/moves/reflect.test.ts

@@ -35,13 +35,14 @@ describe("Moves - Reflect", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     globalScene = game.scene;
-    game.override.battleStyle("single");
+    game.override
-    game.override.ability(Abilities.NONE);
+      .battleStyle("single")
-    game.override.moveset([Moves.ABSORB, Moves.ROCK_SLIDE, Moves.TACKLE]);
+      .ability(Abilities.NONE)
-    game.override.enemyLevel(100);
+      .moveset([Moves.ABSORB, Moves.ROCK_SLIDE, Moves.TACKLE])
-    game.override.enemySpecies(Species.MAGIKARP);
+      .enemyLevel(100)
-    game.override.enemyMoveset([Moves.REFLECT, Moves.REFLECT, Moves.REFLECT, Moves.REFLECT]);
+      .enemySpecies(Species.MAGIKARP)
-    game.override.disableCrits();
+      .enemyMoveset(Moves.REFLECT)
+      .disableCrits();
   });
 
   it("reduces damage of physical attacks by half in a single battle", async () => {

test/moves/retaliate.test.ts

@@ -28,7 +28,7 @@ describe("Moves - Retaliate", () => {
     game.override
       .battleStyle("single")
       .enemySpecies(Species.SNORLAX)
-      .enemyMoveset([Moves.RETALIATE, Moves.RETALIATE, Moves.RETALIATE, Moves.RETALIATE])
+      .enemyMoveset(Moves.RETALIATE)
       .enemyLevel(100)
       .moveset([Moves.RETALIATE, Moves.SPLASH])
       .startingLevel(80)

test/moves/swallow.test.ts

@@ -27,15 +27,14 @@ describe("Moves - Swallow", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
 
-    game.override.battleStyle("single");
+    game.override
-
+      .battleStyle("single")
-    game.override.enemySpecies(Species.RATTATA);
+      .enemySpecies(Species.RATTATA)
-    game.override.enemyMoveset(Moves.SPLASH);
+      .enemyMoveset(Moves.SPLASH)
-    game.override.enemyAbility(Abilities.NONE);
+      .enemyAbility(Abilities.NONE)
-    game.override.enemyLevel(2000);
+      .enemyLevel(2000)
-
+      .moveset(Moves.SWALLOW)
-    game.override.moveset([Moves.SWALLOW, Moves.SWALLOW, Moves.SWALLOW, Moves.SWALLOW]);
+      .ability(Abilities.NONE);
-    game.override.ability(Abilities.NONE);
   });
 
   describe("consumes all stockpile stacks to heal (scaling with stacks)", () => {

test/moves/tackle.test.ts

@@ -24,13 +24,14 @@ describe("Moves - Tackle", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     const moveToUse = Moves.TACKLE;
-    game.override.battleStyle("single");
+    game.override
-    game.override.enemySpecies(Species.MAGIKARP);
+      .battleStyle("single")
-    game.override.startingLevel(1);
+      .enemySpecies(Species.MAGIKARP)
-    game.override.startingWave(97);
+      .startingLevel(1)
-    game.override.moveset([moveToUse]);
+      .startingWave(97)
-    game.override.enemyMoveset([Moves.GROWTH, Moves.GROWTH, Moves.GROWTH, Moves.GROWTH]);
+      .moveset([moveToUse])
-    game.override.disableCrits();
+      .enemyMoveset(Moves.GROWTH)
+      .disableCrits();
   });
 
   it("TACKLE against ghost", async () => {

test/moves/throat_chop.test.ts

@@ -23,11 +23,11 @@ describe("Moves - Throat Chop", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset(Array(4).fill(Moves.GROWL))
+      .moveset(Moves.GROWL)
       .battleStyle("single")
       .ability(Abilities.BALL_FETCH)
       .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset(Array(4).fill(Moves.THROAT_CHOP))
+      .enemyMoveset(Moves.THROAT_CHOP)
       .enemySpecies(Species.MAGIKARP);
   });
 

test/moves/tidy_up.test.ts

@@ -37,8 +37,7 @@ describe("Moves - Tidy Up", () => {
   });
 
   it("spikes are cleared", async () => {
-    game.override.moveset([Moves.SPIKES, Moves.TIDY_UP]);
+    game.override.moveset([Moves.SPIKES, Moves.TIDY_UP]).enemyMoveset(Moves.SPIKES);
-    game.override.enemyMoveset([Moves.SPIKES, Moves.SPIKES, Moves.SPIKES, Moves.SPIKES]);
     await game.classicMode.startBattle();
 
     game.move.select(Moves.SPIKES);
@@ -49,8 +48,7 @@ describe("Moves - Tidy Up", () => {
   }, 20000);
 
   it("stealth rocks are cleared", async () => {
-    game.override.moveset([Moves.STEALTH_ROCK, Moves.TIDY_UP]);
+    game.override.moveset([Moves.STEALTH_ROCK, Moves.TIDY_UP]).enemyMoveset(Moves.STEALTH_ROCK);
-    game.override.enemyMoveset([Moves.STEALTH_ROCK, Moves.STEALTH_ROCK, Moves.STEALTH_ROCK, Moves.STEALTH_ROCK]);
     await game.classicMode.startBattle();
 
     game.move.select(Moves.STEALTH_ROCK);
@@ -61,8 +59,7 @@ describe("Moves - Tidy Up", () => {
   }, 20000);
 
   it("toxic spikes are cleared", async () => {
-    game.override.moveset([Moves.TOXIC_SPIKES, Moves.TIDY_UP]);
+    game.override.moveset([Moves.TOXIC_SPIKES, Moves.TIDY_UP]).enemyMoveset(Moves.TOXIC_SPIKES);
-    game.override.enemyMoveset([Moves.TOXIC_SPIKES, Moves.TOXIC_SPIKES, Moves.TOXIC_SPIKES, Moves.TOXIC_SPIKES]);
     await game.classicMode.startBattle();
 
     game.move.select(Moves.TOXIC_SPIKES);
@@ -73,8 +70,7 @@ describe("Moves - Tidy Up", () => {
   }, 20000);
 
   it("sticky webs are cleared", async () => {
-    game.override.moveset([Moves.STICKY_WEB, Moves.TIDY_UP]);
+    game.override.moveset([Moves.STICKY_WEB, Moves.TIDY_UP]).enemyMoveset(Moves.STICKY_WEB);
-    game.override.enemyMoveset([Moves.STICKY_WEB, Moves.STICKY_WEB, Moves.STICKY_WEB, Moves.STICKY_WEB]);
 
     await game.classicMode.startBattle();
 
@@ -86,8 +82,7 @@ describe("Moves - Tidy Up", () => {
   }, 20000);
 
   it("substitutes are cleared", async () => {
-    game.override.moveset([Moves.SUBSTITUTE, Moves.TIDY_UP]);
+    game.override.moveset([Moves.SUBSTITUTE, Moves.TIDY_UP]).enemyMoveset(Moves.SUBSTITUTE);
-    game.override.enemyMoveset([Moves.SUBSTITUTE, Moves.SUBSTITUTE, Moves.SUBSTITUTE, Moves.SUBSTITUTE]);
 
     await game.classicMode.startBattle();