From cef161c69c8928145363d65908286b528eef0975 Mon Sep 17 00:00:00 2001 From: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com> Date: Tue, 16 Jul 2024 11:44:25 -0400 Subject: [PATCH] working on fixes yay me when when game is broken --- src/logger.ts | 7 ++++++- src/phases.ts | 33 ++++++--------------------------- 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/src/logger.ts b/src/logger.ts index 1a6da1a447c..282324ce32d 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -1502,6 +1502,7 @@ export function flagReset(scene: BattleScene, floor: integer = undefined) { if (localStorage.getItem(getLogID(scene)) == null) localStorage.setItem(getLogID(scene), JSON.stringify(newDocument(getMode(scene) + " Run"))) var drpd = getDRPD(scene) + console.log("Flag Reset", drpd) var wv = getWave(drpd, floor, scene) wv.reload = true; console.log(drpd) @@ -1526,7 +1527,11 @@ export function flagResetIfExists(scene: BattleScene, floor: integer = undefined } } } - if (!waveExists) return; + if (!waveExists) { + console.log("Skipped wave reset because this is not a reload", drpd) + return; + } + console.log("Flag reset as wave was already played before", drpd) var wv = getWave(drpd, floor, scene) wv.reload = true; console.log(drpd) diff --git a/src/phases.ts b/src/phases.ts index 9701c87c2c6..6345fb6e83a 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -3055,7 +3055,7 @@ export class TurnStartPhase extends FieldPhase { if (!queuedMove) { continue; } - LoggerTools.Actions[pokemon.getBattlerIndex()] = new PokemonMove(queuedMove.move).getName() + LoggerTools.Actions[pokemon.getBattlerIndex()] = `[[ ${new PokemonMove(queuedMove.move).getName()} unknown target ]]` break; case Command.BALL: var ballNames = [ @@ -3144,9 +3144,10 @@ export class TurnStartPhase extends FieldPhase { const move = pokemon.getMoveset().find(m => m.moveId === queuedMove.move) || new PokemonMove(queuedMove.move); if (pokemon.isPlayer()) { if (turnCommand.cursor === -1) { + console.log("turncommand cursor was -1 -- running TOP block") this.scene.pushPhase(new MovePhase(this.scene, pokemon, turnCommand.targets || turnCommand.move.targets, move)); var targets = turnCommand.targets || turnCommand.move.targets - var mv = new PokemonMove(queuedMove.move) + var mv = move if (pokemon.isPlayer()) { console.log(turnCommand.targets, turnCommand.move.targets) LoggerTools.Actions[pokemon.getBattlerIndex()] = mv.getName() @@ -3171,9 +3172,10 @@ export class TurnStartPhase extends FieldPhase { console.log(mv.getName(), targets) } } else { + console.log("turncommand = ", turnCommand, " -- running BOTTO< block") const playerPhase = new MovePhase(this.scene, pokemon, turnCommand.targets || turnCommand.move.targets, move, false, queuedMove.ignorePP); var targets = turnCommand.targets || turnCommand.move.targets - var mv = new PokemonMove(queuedMove.move) + var mv = move if (pokemon.isPlayer()) { console.log(turnCommand.targets, turnCommand.move.targets) LoggerTools.Actions[pokemon.getBattlerIndex()] = mv.getName() @@ -3202,30 +3204,7 @@ export class TurnStartPhase extends FieldPhase { } else { this.scene.pushPhase(new MovePhase(this.scene, pokemon, turnCommand.targets || turnCommand.move.targets, move, false, queuedMove.ignorePP)); var targets = turnCommand.targets || turnCommand.move.targets - var mv = new PokemonMove(queuedMove.move) - if (pokemon.isPlayer()) { - console.log(turnCommand.targets, turnCommand.move.targets) - LoggerTools.Actions[pokemon.getBattlerIndex()] = mv.getName() - if (this.scene.currentBattle.double) { - var targIDs = ["Counter", "Self", "Ally", "L", "R"] - if (pokemon.getBattlerIndex() == 1) targIDs = ["Counter", "Ally", "Self", "L", "R"] - LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) - } else { - var targIDs = ["Counter", "", "", "", ""] - var myField = this.scene.getField() - if (myField[0]) - targIDs[1] = myField[0].name - if (myField[1]) - targIDs[2] = myField[1].name - var eField = this.scene.getEnemyField() - if (eField[0]) - targIDs[3] = eField[0].name - if (eField[1]) - targIDs[4] = eField[1].name - //LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) - } - console.log(mv.getName(), targets) - } + var mv = new PokemonMove(queuedMove.move) } break; case Command.BALL: