From 3fc830f4016871f77001040060f97b5c0311a540 Mon Sep 17 00:00:00 2001
From: Flashfyre <flashfireex@gmail.com>
Date: Fri, 2 Jun 2023 11:41:08 -0400
Subject: [PATCH] Fix some bugs related to double battles

---
 src/battle-phases.ts | 26 ++++++++++++--------------
 src/pokemon.ts       |  6 +++---
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/battle-phases.ts b/src/battle-phases.ts
index 7c101f72924..dc44b005cec 100644
--- a/src/battle-phases.ts
+++ b/src/battle-phases.ts
@@ -545,18 +545,16 @@ export class SummonPhase extends PartyMemberPokemonPhase {
   }
 
   end() {
-    const playerField = this.scene.getPlayerField();
+    const pokemon = this.getPokemon();
 
-    playerField.forEach((pokemon, p) => {
-      if (pokemon.shiny)
-        this.scene.unshiftPhase(new ShinySparklePhase(this.scene, p));
-    });
+    if (pokemon.shiny)
+      this.scene.unshiftPhase(new ShinySparklePhase(this.scene, pokemon.getBattlerIndex()));
 
-    playerField.forEach(pokemon => pokemon.resetTurnData());
+    pokemon.resetTurnData();
 
-    playerField.forEach(pokemon => this.scene.arena.applyTags(ArenaTrapTag, pokemon));
+    this.scene.arena.applyTags(ArenaTrapTag, pokemon);
 
-    playerField.forEach(pokemon => applyPostSummonAbAttrs(PostSummonAbAttr, pokemon));
+    applyPostSummonAbAttrs(PostSummonAbAttr, pokemon);
 
     super.end();
   }
@@ -830,7 +828,7 @@ export class CommandPhase extends FieldPhase {
             this.scene.ui.setMode(Mode.COMMAND);
           }, null, true);
         } else if (cursor < 4) {
-          const targets = this.scene.getEnemyField().filter(p => p.isActive()).map(p => p.getBattlerIndex());
+          const targets = this.scene.getEnemyField().filter(p => p.isActive(true)).map(p => p.getBattlerIndex());
           this.scene.currentBattle.turnCommands[this.fieldIndex] = { command: Command.BALL, cursor: cursor };
           this.scene.currentBattle.turnPokeballCounts[cursor as PokeballType]--;
           if (targets.length > 1)
@@ -1119,7 +1117,7 @@ export class MovePhase extends BattlePhase {
   }
 
   canMove(): boolean {
-    return !!this.pokemon.hp && this.move.isUsable(this.ignorePp) && !!this.targets.length;
+    return this.pokemon.isActive(true) && this.move.isUsable(this.ignorePp) && !!this.targets.length;
   }
 
   cancel(): void {
@@ -1141,7 +1139,7 @@ export class MovePhase extends BattlePhase {
     console.log(this.targets);
 
     const targets = this.scene.getField().filter(p => {
-      if (p?.isActive() && this.targets.indexOf(p.getBattlerIndex()) > -1) {
+      if (p?.isActive(true) && this.targets.indexOf(p.getBattlerIndex()) > -1) {
         const hiddenTag = p.getTag(HiddenTag);
         if (hiddenTag && !this.move.getMove().getAttrs(HitsTagAttr).filter(hta => (hta as HitsTagAttr).tagType === hiddenTag.tagType).length)
           return false;
@@ -1384,7 +1382,7 @@ class MoveEffectPhase extends PokemonPhase {
   }
 
   getTargets(): Pokemon[] {
-    return this.scene.getField().filter(p => p?.isActive() && this.targets.indexOf(p.getBattlerIndex()) > -1);
+    return this.scene.getField().filter(p => p?.isActive(true) && this.targets.indexOf(p.getBattlerIndex()) > -1);
   }
 
   getTarget(): Pokemon {
@@ -1634,7 +1632,7 @@ export class PostTurnStatusEffectPhase extends PokemonPhase {
 
   start() {
     const pokemon = this.getPokemon();
-    if (pokemon?.isActive() && pokemon.status && pokemon.status.isPostTurn()) {
+    if (pokemon?.isActive(true) && pokemon.status && pokemon.status.isPostTurn()) {
       pokemon.status.incrementTurn();
       new CommonBattleAnim(CommonAnim.POISON + (pokemon.status.effect - 1), pokemon).play(this.scene, () => {
         this.scene.queueMessage(getPokemonMessage(pokemon, getStatusEffectActivationText(pokemon.status.effect)));
@@ -2138,7 +2136,7 @@ export class PokemonHealPhase extends CommonAnimPhase {
   end() {
     const pokemon = this.getPokemon();
     
-    if (!this.getPokemon().isActive()) {
+    if (!this.getPokemon().isActive(true)) {
       super.end();
       return;
     }
diff --git a/src/pokemon.ts b/src/pokemon.ts
index 3ae89057fc9..032607aaf8e 100644
--- a/src/pokemon.ts
+++ b/src/pokemon.ts
@@ -192,8 +192,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     return !this.hp && (!checkStatus || this.status?.effect === StatusEffect.FAINT);
   }
 
-  isActive(): boolean {
-    return !this.isFainted() && !!this.scene;
+  isActive(onField?: boolean): boolean {
+    return !this.isFainted() && !!this.scene && (!onField || this.scene.field.getIndex(this) > -1);
   }
 
   abstract isPlayer(): boolean;
@@ -1196,7 +1196,7 @@ export class EnemyPokemon extends Pokemon {
 
   getNextTargets(moveId: Moves): BattlerIndex[] {
     const moveTargets = getMoveTargets(this, moveId);
-    const targets = this.scene.getField().filter(p => p?.isActive() && moveTargets.targets.indexOf(p.getBattlerIndex()) > -1);
+    const targets = this.scene.getField().filter(p => p?.isActive(true) && moveTargets.targets.indexOf(p.getBattlerIndex()) > -1);
     if (moveTargets.multiple)
       return targets.map(p => p.getBattlerIndex());