Merge branch 'beta' into reviverseed

src/data/moves/invalid-moves.ts

@@ -3,144 +3,46 @@ import { Moves } from "#enums/moves";
 /** Set of moves that cannot be called by {@linkcode Moves.METRONOME Metronome} */
 export const invalidMetronomeMoves: ReadonlySet<Moves> = new Set([
   Moves.AFTER_YOU,
-  Moves.APPLE_ACID,
-  Moves.ARMOR_CANNON,
   Moves.ASSIST,
-  Moves.ASTRAL_BARRAGE,
-  Moves.AURA_WHEEL,
   Moves.BANEFUL_BUNKER,
   Moves.BEAK_BLAST,
-  Moves.BEHEMOTH_BASH,
-  Moves.BEHEMOTH_BLADE,
   Moves.BELCH,
   Moves.BESTOW,
-  Moves.BLAZING_TORQUE,
-  Moves.BODY_PRESS,
-  Moves.BRANCH_POKE,
-  Moves.BREAKING_SWIPE,
-  Moves.CELEBRATE,
-  Moves.CHATTER,
-  Moves.CHILLING_WATER,
-  Moves.CHILLY_RECEPTION,
-  Moves.CLANGOROUS_SOUL,
-  Moves.COLLISION_COURSE,
-  Moves.COMBAT_TORQUE,
   Moves.COMEUPPANCE,
   Moves.COPYCAT,
   Moves.COUNTER,
-  Moves.COVET,
   Moves.CRAFTY_SHIELD,
-  Moves.DECORATE,
   Moves.DESTINY_BOND,
   Moves.DETECT,
-  Moves.DIAMOND_STORM,
-  Moves.DOODLE,
-  Moves.DOUBLE_IRON_BASH,
-  Moves.DOUBLE_SHOCK,
-  Moves.DRAGON_ASCENT,
-  Moves.DRAGON_ENERGY,
-  Moves.DRUM_BEATING,
-  Moves.DYNAMAX_CANNON,
-  Moves.ELECTRO_DRIFT,
   Moves.ENDURE,
-  Moves.ETERNABEAM,
-  Moves.FALSE_SURRENDER,
   Moves.FEINT,
-  Moves.FIERY_WRATH,
-  Moves.FILLET_AWAY,
-  Moves.FLEUR_CANNON,
   Moves.FOCUS_PUNCH,
   Moves.FOLLOW_ME,
-  Moves.FREEZE_SHOCK,
-  Moves.FREEZING_GLARE,
-  Moves.GLACIAL_LANCE,
-  Moves.GRAV_APPLE,
   Moves.HELPING_HAND,
-  Moves.HOLD_HANDS,
-  Moves.HYPER_DRILL,
-  Moves.HYPERSPACE_FURY,
-  Moves.HYPERSPACE_HOLE,
-  Moves.ICE_BURN,
   Moves.INSTRUCT,
-  Moves.JET_PUNCH,
-  Moves.JUNGLE_HEALING,
   Moves.KINGS_SHIELD,
-  Moves.LIFE_DEW,
-  Moves.LIGHT_OF_RUIN,
-  Moves.MAKE_IT_RAIN,
-  Moves.MAGICAL_TORQUE,
   Moves.MAT_BLOCK,
   Moves.ME_FIRST,
-  Moves.METEOR_ASSAULT,
   Moves.METRONOME,
   Moves.MIMIC,
-  Moves.MIND_BLOWN,
   Moves.MIRROR_COAT,
   Moves.MIRROR_MOVE,
-  Moves.MOONGEIST_BEAM,
-  Moves.NATURE_POWER,
-  Moves.NATURES_MADNESS,
-  Moves.NOXIOUS_TORQUE,
   Moves.OBSTRUCT,
-  Moves.ORDER_UP,
-  Moves.ORIGIN_PULSE,
-  Moves.OVERDRIVE,
-  Moves.PHOTON_GEYSER,
-  Moves.PLASMA_FISTS,
-  Moves.POPULATION_BOMB,
-  Moves.POUNCE,
-  Moves.POWER_SHIFT,
-  Moves.PRECIPICE_BLADES,
   Moves.PROTECT,
-  Moves.PYRO_BALL,
   Moves.QUASH,
   Moves.QUICK_GUARD,
-  Moves.RAGE_FIST,
   Moves.RAGE_POWDER,
-  Moves.RAGING_BULL,
-  Moves.RAGING_FURY,
-  Moves.RELIC_SONG,
   Moves.REVIVAL_BLESSING,
-  Moves.RUINATION,
-  Moves.SALT_CURE,
-  Moves.SECRET_SWORD,
-  Moves.SHED_TAIL,
   Moves.SHELL_TRAP,
   Moves.SILK_TRAP,
   Moves.SKETCH,
   Moves.SLEEP_TALK,
-  Moves.SNAP_TRAP,
-  Moves.SNARL,
   Moves.SNATCH,
   Moves.SNORE,
-  Moves.SNOWSCAPE,
-  Moves.SPECTRAL_THIEF,
-  Moves.SPICY_EXTRACT,
   Moves.SPIKY_SHIELD,
-  Moves.SPIRIT_BREAK,
   Moves.SPOTLIGHT,
-  Moves.STEAM_ERUPTION,
-  Moves.STEEL_BEAM,
-  Moves.STRANGE_STEAM,
   Moves.STRUGGLE,
-  Moves.SUNSTEEL_STRIKE,
-  Moves.SURGING_STRIKES,
-  Moves.SWITCHEROO,
-  Moves.TECHNO_BLAST,
-  Moves.TERA_STARSTORM,
-  Moves.THIEF,
-  Moves.THOUSAND_ARROWS,
-  Moves.THOUSAND_WAVES,
-  Moves.THUNDER_CAGE,
-  Moves.THUNDEROUS_KICK,
-  Moves.TIDY_UP,
-  Moves.TRAILBLAZE,
   Moves.TRANSFORM,
-  Moves.TRICK,
-  Moves.TWIN_BEAM,
-  Moves.V_CREATE,
-  Moves.WICKED_BLOW,
-  Moves.WICKED_TORQUE,
   Moves.WIDE_GUARD,
 ]);
 
@@ -157,7 +59,6 @@ export const invalidAssistMoves: ReadonlySet<Moves> = new Set([
   Moves.CIRCLE_THROW,
   Moves.COPYCAT,
   Moves.COUNTER,
-  Moves.COVET,
   Moves.DESTINY_BOND,
   Moves.DETECT,
   Moves.DIG,
@@ -192,7 +93,6 @@ export const invalidAssistMoves: ReadonlySet<Moves> = new Set([
   Moves.SPOTLIGHT,
   Moves.STRUGGLE,
   Moves.SWITCHEROO,
-  Moves.THIEF,
   Moves.TRANSFORM,
   Moves.TRICK,
   Moves.WHIRLWIND,
@@ -208,7 +108,6 @@ export const invalidSleepTalkMoves: ReadonlySet<Moves> = new Set([
   Moves.COPYCAT,
   Moves.DIG,
   Moves.DIVE,
-  Moves.DYNAMAX_CANNON,
   Moves.FREEZE_SHOCK,
   Moves.FLY,
   Moves.FOCUS_PUNCH,
@@ -238,15 +137,12 @@ export const invalidCopycatMoves: ReadonlySet<Moves> = new Set([
   Moves.ASSIST,
   Moves.BANEFUL_BUNKER,
   Moves.BEAK_BLAST,
-  Moves.BEHEMOTH_BASH,
-  Moves.BEHEMOTH_BLADE,
   Moves.BESTOW,
   Moves.CELEBRATE,
   Moves.CHATTER,
   Moves.CIRCLE_THROW,
   Moves.COPYCAT,
   Moves.COUNTER,
-  Moves.COVET,
   Moves.DESTINY_BOND,
   Moves.DETECT,
   Moves.DRAGON_TAIL,
@@ -274,8 +170,73 @@ export const invalidCopycatMoves: ReadonlySet<Moves> = new Set([
   Moves.SPOTLIGHT,
   Moves.STRUGGLE,
   Moves.SWITCHEROO,
-  Moves.THIEF,
   Moves.TRANSFORM,
   Moves.TRICK,
   Moves.WHIRLWIND,
 ]);
+
+export const invalidMirrorMoveMoves: ReadonlySet<Moves> = new Set([
+  Moves.ACUPRESSURE,
+  Moves.AFTER_YOU,
+  Moves.AROMATIC_MIST,
+  Moves.BEAK_BLAST,
+  Moves.BELCH,
+  Moves.CHILLY_RECEPTION,
+  Moves.COACHING,
+  Moves.CONVERSION_2,
+  Moves.COUNTER,
+  Moves.CRAFTY_SHIELD,
+  Moves.CURSE,
+  Moves.DECORATE,
+  Moves.DOODLE,
+  Moves.DOOM_DESIRE,
+  Moves.DRAGON_CHEER,
+  Moves.ELECTRIC_TERRAIN,
+  Moves.FINAL_GAMBIT,
+  Moves.FLORAL_HEALING,
+  Moves.FLOWER_SHIELD,
+  Moves.FOCUS_PUNCH,
+  Moves.FUTURE_SIGHT,
+  Moves.GEAR_UP,
+  Moves.GRASSY_TERRAIN,
+  Moves.GRAVITY,
+  Moves.GUARD_SPLIT,
+  Moves.HAIL,
+  Moves.HAZE,
+  Moves.HEAL_PULSE,
+  Moves.HELPING_HAND,
+  Moves.HOLD_HANDS,
+  Moves.INSTRUCT,
+  Moves.ION_DELUGE,
+  Moves.MAGNETIC_FLUX,
+  Moves.MAT_BLOCK,
+  Moves.ME_FIRST,
+  Moves.MIMIC,
+  Moves.MIRROR_COAT,
+  Moves.MIRROR_MOVE,
+  Moves.MIST,
+  Moves.MISTY_TERRAIN,
+  Moves.MUD_SPORT,
+  Moves.PERISH_SONG,
+  Moves.POWER_SPLIT,
+  Moves.PSYCH_UP,
+  Moves.PSYCHIC_TERRAIN,
+  Moves.PURIFY,
+  Moves.QUICK_GUARD,
+  Moves.RAIN_DANCE,
+  Moves.REFLECT_TYPE,
+  Moves.ROLE_PLAY,
+  Moves.ROTOTILLER,
+  Moves.SANDSTORM,
+  Moves.SHELL_TRAP,
+  Moves.SKETCH,
+  Moves.SNOWSCAPE,
+  Moves.SPIT_UP,
+  Moves.SPOTLIGHT,
+  Moves.STRUGGLE,
+  Moves.SUNNY_DAY,
+  Moves.TEATIME,
+  Moves.TRANSFORM,
+  Moves.WATER_SPORT,
+  Moves.WIDE_GUARD,
+]);

src/data/moves/move.ts

@@ -125,7 +125,7 @@ import { MoveTarget } from "#enums/MoveTarget";
 import { MoveFlags } from "#enums/MoveFlags";
 import { MoveEffectTrigger } from "#enums/MoveEffectTrigger";
 import { MultiHitType } from "#enums/MultiHitType";
-import { invalidAssistMoves, invalidCopycatMoves, invalidMetronomeMoves, invalidSleepTalkMoves } from "./invalid-moves";
+import { invalidAssistMoves, invalidCopycatMoves, invalidMetronomeMoves, invalidMirrorMoveMoves, invalidSleepTalkMoves } from "./invalid-moves";
 
 type MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) => boolean;
 type UserMoveConditionFunc = (user: Pokemon, move: Move) => boolean;
@@ -6965,7 +6965,8 @@ export class CopyMoveAttr extends CallMoveAttr {
   getCondition(): MoveConditionFunc {
     return (user, target, move) => {
       if (this.mirrorMove) {
-        return target.getMoveHistory().length !== 0;
+        const lastMove = target.getLastXMoves()[0]?.move;
+        return !!lastMove && !this.invalidMoves.has(lastMove);
       } else {
         const lastMove = globalScene.currentBattle.lastMove;
         return lastMove !== undefined && !this.invalidMoves.has(lastMove);
@@ -8561,7 +8562,7 @@ export function initMoves() {
     new SelfStatusMove(Moves.METRONOME, PokemonType.NORMAL, -1, 10, -1, 0, 1)
       .attr(RandomMoveAttr, invalidMetronomeMoves),
     new StatusMove(Moves.MIRROR_MOVE, PokemonType.FLYING, -1, 20, -1, 0, 1)
-      .attr(CopyMoveAttr, true),
+      .attr(CopyMoveAttr, true, invalidMirrorMoveMoves),
     new AttackMove(Moves.SELF_DESTRUCT, PokemonType.NORMAL, MoveCategory.PHYSICAL, 200, 100, 5, -1, 0, 1)
       .attr(SacrificialAttr)
       .makesContact(false)