cdnutter
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Fake Out logic

pull/16/head
Flashfyre 2024-03-14 18:03:38 -04:00
parent c3791dfc81
commit 10cacbe5af
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/field/pokemon.ts
View File

@ -32,7 +32,6 @@ import { BattleSpec } from "../enums/battle-spec";
import { Mode } from '../ui/ui'; import { Mode } from '../ui/ui';
import PartyUiHandler, { PartyOption, PartyUiMode } from '../ui/party-ui-handler'; import PartyUiHandler, { PartyOption, PartyUiMode } from '../ui/party-ui-handler';
import SoundFade from 'phaser3-rex-plugins/plugins/soundfade'; import SoundFade from 'phaser3-rex-plugins/plugins/soundfade';
import { GameModes } from '../game-mode';
import { LevelMoves } from '../data/pokemon-level-moves'; import { LevelMoves } from '../data/pokemon-level-moves';
import { DamageAchv, achvs } from '../system/achv'; import { DamageAchv, achvs } from '../system/achv';
import { DexAttr, StarterMoveset } from '../system/game-data'; import { DexAttr, StarterMoveset } from '../system/game-data';

1
src/game-mode.ts
View File

@ -30,7 +30,6 @@ export class GameMode implements GameModeConfig {
constructor(modeId: GameModes, config: GameModeConfig) { constructor(modeId: GameModes, config: GameModeConfig) {
this.modeId = modeId; this.modeId = modeId;
Object.assign(this, config); Object.assign(this, config);
console.log(modeId, this, config);
} }
getWaveForDifficulty(waveIndex: integer): integer { getWaveForDifficulty(waveIndex: integer): integer {

3
src/phases.ts
View File

@ -1152,7 +1152,8 @@ export class SwitchSummonPhase extends SummonPhase {
const pokemon = this.getPokemon(); const pokemon = this.getPokemon();
// Compensate for turn spent summoning // Compensate for turn spent summoning
pokemon.battleSummonData.turnCount--; if (pokemon.scene.currentBattle.turn > 1)
pokemon.battleSummonData.turnCount--;
if (this.batonPass && pokemon) if (this.batonPass && pokemon)
pokemon.transferSummon(this.lastPokemon); pokemon.transferSummon(this.lastPokemon);