merge changes on beta branch

Author: PyGaVS

src/data/move.ts

@@ -5379,35 +5379,6 @@ export class SuppressAbilitiesIfActedAttr extends MoveEffectAttr {
   }
 }
 
-/**
- * Applies the effects of {@linkcode SuppressAbilitiesAttr} if the target has already moved this turn.
- * @extends MoveEffectAttr
- * @see {@linkcode Moves.CORE_ENFORCER} (the move which uses this effect)
- */
-export class SuppressAbilitiesIfActedAttr extends MoveEffectAttr {
-  /**
-   * If the target has already acted this turn, apply a {@linkcode SuppressAbilitiesAttr} effect unless the
-   * abillity cannot be suppressed. This is a secondary effect and has no bearing on the success or failure of the move.
-   *
-   * @returns True if the move occurred, otherwise false. Note that true will be returned even if the target has not
-   * yet moved or if the target's abiilty is un-suppressable.
-   */
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    if (!super.apply(user, target, move, args)) {
-      return false;
-    }
-
-    if (target.turnData.acted) {
-      const suppressAttr = new SuppressAbilitiesAttr();
-      if (suppressAttr.getCondition()(user, target, move)) {
-        suppressAttr.apply(user, target, move, args);
-      }
-    }
-
-    return true;
-  }
-}
-
 export class TransformAttr extends MoveEffectAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
     return new Promise(resolve => {

src/phases.ts

@@ -66,7 +66,7 @@ import { PlayerGender } from "#enums/player-gender";
 import { Species } from "#enums/species";
 import { TrainerType } from "#enums/trainer-type";
 import { applyChallenges, ChallengeType } from "./data/challenge";
-import { ExpNotification } from "./enums/exp-notification";
+
 
 const { t } = i18next;