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

@@ -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,6 +91,8 @@ 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;
   }

src/phases.ts

@@ -2023,13 +2023,15 @@ 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();
       }
-      }
 
       const moveQueue = this.pokemon.getMoveQueue();