mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-26 17:29:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

working on fixes yay

Browse Source 
me when when game is broken
This commit is contained in:
RedstonewolfX 2024-07-16 11:44:25 -04:00
parent 6af3f4ef3f
commit cef161c69c
2 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/logger.ts
View File

@ -1502,6 +1502,7 @@ export function flagReset(scene: BattleScene, floor: integer = undefined) {
if (localStorage.getItem(getLogID(scene)) == null) if (localStorage.getItem(getLogID(scene)) == null)
localStorage.setItem(getLogID(scene), JSON.stringify(newDocument(getMode(scene) + " Run"))) localStorage.setItem(getLogID(scene), JSON.stringify(newDocument(getMode(scene) + " Run")))
var drpd = getDRPD(scene) var drpd = getDRPD(scene)
console.log("Flag Reset", drpd)
var wv = getWave(drpd, floor, scene) var wv = getWave(drpd, floor, scene)
wv.reload = true; wv.reload = true;
console.log(drpd) 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) var wv = getWave(drpd, floor, scene)
wv.reload = true; wv.reload = true;
console.log(drpd) console.log(drpd)

33
src/phases.ts
View File

@ -3055,7 +3055,7 @@ export class TurnStartPhase extends FieldPhase {
if (!queuedMove) { if (!queuedMove) {
continue; continue;
} }
LoggerTools.Actions[pokemon.getBattlerIndex()] = new PokemonMove(queuedMove.move).getName() LoggerTools.Actions[pokemon.getBattlerIndex()] = `[[ ${new PokemonMove(queuedMove.move).getName()} unknown target ]]`
break; break;
case Command.BALL: case Command.BALL:
var ballNames = [ 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); const move = pokemon.getMoveset().find(m => m.moveId === queuedMove.move) || new PokemonMove(queuedMove.move);
if (pokemon.isPlayer()) { if (pokemon.isPlayer()) {
if (turnCommand.cursor === -1) { 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)); this.scene.pushPhase(new MovePhase(this.scene, pokemon, turnCommand.targets || turnCommand.move.targets, move));
var targets = turnCommand.targets || turnCommand.move.targets var targets = turnCommand.targets || turnCommand.move.targets
var mv = new PokemonMove(queuedMove.move) var mv = move
if (pokemon.isPlayer()) { if (pokemon.isPlayer()) {
console.log(turnCommand.targets, turnCommand.move.targets) console.log(turnCommand.targets, turnCommand.move.targets)
LoggerTools.Actions[pokemon.getBattlerIndex()] = mv.getName() LoggerTools.Actions[pokemon.getBattlerIndex()] = mv.getName()
@ -3171,9 +3172,10 @@ export class TurnStartPhase extends FieldPhase {
console.log(mv.getName(), targets) console.log(mv.getName(), targets)
} }
} else { } else {
console.log("turncommand = ", turnCommand, " -- running BOTTO< block")
const playerPhase = new MovePhase(this.scene, pokemon, turnCommand.targets || turnCommand.move.targets, move, false, queuedMove.ignorePP); const playerPhase = new MovePhase(this.scene, pokemon, turnCommand.targets || turnCommand.move.targets, move, false, queuedMove.ignorePP);
var targets = turnCommand.targets || turnCommand.move.targets var targets = turnCommand.targets || turnCommand.move.targets
var mv = new PokemonMove(queuedMove.move) var mv = move
if (pokemon.isPlayer()) { if (pokemon.isPlayer()) {
console.log(turnCommand.targets, turnCommand.move.targets) console.log(turnCommand.targets, turnCommand.move.targets)
LoggerTools.Actions[pokemon.getBattlerIndex()] = mv.getName() LoggerTools.Actions[pokemon.getBattlerIndex()] = mv.getName()
@ -3202,30 +3204,7 @@ export class TurnStartPhase extends FieldPhase {
} else { } else {
this.scene.pushPhase(new MovePhase(this.scene, pokemon, turnCommand.targets || turnCommand.move.targets, move, false, queuedMove.ignorePP)); 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 targets = turnCommand.targets || turnCommand.move.targets
var mv = new PokemonMove(queuedMove.move) 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)
}
} }
break; break;
case Command.BALL: case Command.BALL: