From 01152314f0272e23b4b17b2dbff8548fd453a826 Mon Sep 17 00:00:00 2001
From: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com>
Date: Sun, 8 Sep 2024 12:15:52 -0400
Subject: [PATCH] Update Beta

yippee
---
 src/data/ability.ts                  | 6 +++---
 src/phases/egg-lapse-phase.ts        | 1 -
 src/phases/select-challenge-phase.ts | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/data/ability.ts b/src/data/ability.ts
index 93661d7ca23..b284ecdbc38 100644
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@@ -1085,8 +1085,8 @@ export class PostDefendMoveDisableAbAttr extends PostDefendAbAttr {
   }
 
   applyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean {
-    if (!attacker.summonData.disabledMove) {
-      if (move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) && (this.chance === -1 || pokemon.randSeedInt(100) < this.chance) && !attacker.isMax()) {
+    if (attacker.getTag(BattlerTagType.DISABLED) === null) {
+      if (move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) && (this.chance === -1 || pokemon.randSeedInt(100, undefined, "Chance to disable a move") < this.chance) && !attacker.isMax()) {
         if (simulated) {
           return true;
         }
@@ -2642,7 +2642,7 @@ export class ConfusionOnStatusEffectAbAttr extends PostAttackAbAttr {
       if (simulated) {
         return defender.canAddTag(BattlerTagType.CONFUSED);
       } else {
-        return defender.addTag(BattlerTagType.CONFUSED, pokemon.randSeedInt(3, 2), move.id, defender.id);
+        return defender.addTag(BattlerTagType.CONFUSED, pokemon.randSeedIntRange(2, 5, "Duration of Confusion effect"), move.id, defender.id);
       }
     }
     return false;
diff --git a/src/phases/egg-lapse-phase.ts b/src/phases/egg-lapse-phase.ts
index 1f9825c1403..1adb1568166 100644
--- a/src/phases/egg-lapse-phase.ts
+++ b/src/phases/egg-lapse-phase.ts
@@ -9,7 +9,6 @@ import { achvs } from "#app/system/achv";
 import { PlayerPokemon } from "#app/field/pokemon";
 import { EggSummaryPhase } from "./egg-summary-phase";
 import { EggHatchData } from "#app/data/egg-hatch-data";
-import * as LoggerTools from "../logger";
 
 /**
  * Phase that handles updating eggs, and hatching any ready eggs
diff --git a/src/phases/select-challenge-phase.ts b/src/phases/select-challenge-phase.ts
index e26accc67ca..9450c60fec5 100644
--- a/src/phases/select-challenge-phase.ts
+++ b/src/phases/select-challenge-phase.ts
@@ -1,7 +1,6 @@
 import BattleScene from "#app/battle-scene";
 import { Phase } from "#app/phase";
 import { Mode } from "#app/ui/ui";
-import * as LoggerTools from "../logger";
 
 export class SelectChallengePhase extends Phase {
   constructor(scene: BattleScene) {