From 314b7dba4350d8dbb1c3300de93c71eef5fe8de3 Mon Sep 17 00:00:00 2001
From: Stophles <71789013+Stophles@users.noreply.github.com>
Date: Fri, 5 Apr 2024 19:42:30 -0500
Subject: [PATCH] Fixing Confusion triggering after Sleep, Paralysis, and
 Recharging (#44)

* Recharge checked earlier, Move Tags not checked if move cancelled

Recharge is now checked at the start of doMove to determine if other Tags need to be checked or if the pokemon is recharging.  If the move is already cancelled, Move lapse tags are no longer checked (To account for Sleep/Paralyze happening before hand, so confusion would never trigger)

* PRE_MOVE Lapse added for Recharge, Recharge now cancels

Added a PRE_MOVE Identifier for Recharge specifically, which now cancels the move and shifts the move queue (since this will no longer occur in doMove. This prevents Confusion/Infatuation from also being triggered after a Pokemon is recharging.

* Changed spacing
---
 src/data/battler-tags.ts |  9 ++++++---
 src/phases.ts            | 14 ++++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index 7ac8d1412f3..c4fb18cb46d 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -17,6 +17,7 @@ import { BattleStat } from "./battle-stat";
 export enum BattlerTagLapseType {
   FAINT,
   MOVE,
+  PRE_MOVE,
   AFTER_MOVE,
   MOVE_EFFECT,
   TURN_END,
@@ -77,7 +78,7 @@ export interface TerrainBattlerTag {
 
 export class RechargingTag extends BattlerTag {
   constructor(sourceMove: Moves) {
-    super(BattlerTagType.RECHARGING, BattlerTagLapseType.MOVE, 1, sourceMove);
+    super(BattlerTagType.RECHARGING, BattlerTagLapseType.PRE_MOVE, 1, sourceMove);
   }
 
   onAdd(pokemon: Pokemon): void {
@@ -90,7 +91,9 @@ export class RechargingTag extends BattlerTag {
     super.lapse(pokemon, lapseType);
 
     pokemon.scene.queueMessage(getPokemonMessage(pokemon, ' must\nrecharge!'));
-
+    (pokemon.scene.getCurrentPhase() as MovePhase).cancel();
+    pokemon.getMoveQueue().shift();
+    
     return true;
   }
 }
@@ -1042,4 +1045,4 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: integer, sourc
     default:
         return new BattlerTag(tagType, BattlerTagLapseType.CUSTOM, turnCount, sourceMove, sourceId);
   }
-}
\ No newline at end of file
+}
diff --git a/src/phases.ts b/src/phases.ts
index 08721c1e2ca..24f13c87595 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -2023,12 +2023,14 @@ export class MovePhase extends BattlePhase {
     });
 
     const doMove = () => {
-      if (!this.followUp && this.canMove()) {
+      this.pokemon.lapseTags(BattlerTagLapseType.PRE_MOVE);
+	    
+      if (!this.followUp && this.canMove() && !this.cancelled) {
         this.pokemon.lapseTags(BattlerTagLapseType.MOVE);
-        if (this.cancelled) {
-          this.pokemon.pushMoveHistory({ move: Moves.NONE, result: MoveResult.FAIL });
-          return this.end();
-        }
+      }
+      if (this.cancelled) {
+        this.pokemon.pushMoveHistory({ move: Moves.NONE, result: MoveResult.FAIL });
+        return this.end();
       }
 
       const moveQueue = this.pokemon.getMoveQueue();
@@ -4242,4 +4244,4 @@ export class TestMessagePhase extends MessagePhase {
   constructor(scene: BattleScene, message: string) {
     super(scene, message, null, true);
   }
-}
\ No newline at end of file
+}