From 10cacbe5af539e628849f3ff3962f57e03eab938 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Thu, 14 Mar 2024 18:03:38 -0400 Subject: [PATCH] Fix Fake Out logic --- src/field/pokemon.ts | 1 - src/game-mode.ts | 1 - src/phases.ts | 3 ++- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 0a79319ab..d5b2b0f15 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -32,7 +32,6 @@ import { BattleSpec } from "../enums/battle-spec"; import { Mode } from '../ui/ui'; import PartyUiHandler, { PartyOption, PartyUiMode } from '../ui/party-ui-handler'; import SoundFade from 'phaser3-rex-plugins/plugins/soundfade'; -import { GameModes } from '../game-mode'; import { LevelMoves } from '../data/pokemon-level-moves'; import { DamageAchv, achvs } from '../system/achv'; import { DexAttr, StarterMoveset } from '../system/game-data'; diff --git a/src/game-mode.ts b/src/game-mode.ts index ebb7582ab..45f303885 100644 --- a/src/game-mode.ts +++ b/src/game-mode.ts @@ -30,7 +30,6 @@ export class GameMode implements GameModeConfig { constructor(modeId: GameModes, config: GameModeConfig) { this.modeId = modeId; Object.assign(this, config); - console.log(modeId, this, config); } getWaveForDifficulty(waveIndex: integer): integer { diff --git a/src/phases.ts b/src/phases.ts index 21ded3f97..fa91b16d3 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -1152,7 +1152,8 @@ export class SwitchSummonPhase extends SummonPhase { const pokemon = this.getPokemon(); // Compensate for turn spent summoning - pokemon.battleSummonData.turnCount--; + if (pokemon.scene.currentBattle.turn > 1) + pokemon.battleSummonData.turnCount--; if (this.batonPass && pokemon) pokemon.transferSummon(this.lastPokemon);