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

Fix action targets not being logged

Browse Source
This commit is contained in:
RedstonewolfX 2024-07-12 22:23:45 -04:00
parent 9e442f2b07
commit 94ad9d2ba2
1 changed files with 65 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
src/phases.ts
View File

@ -2872,81 +2872,84 @@ export class TurnStartPhase extends FieldPhase {
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()) { if (pokemon.isPlayer()) {
console.log(turnCommand.targets, turnCommand.move.targets)
LoggerTools.Actions[pokemon.getBattlerIndex()] = mv.getName() LoggerTools.Actions[pokemon.getBattlerIndex()] = mv.getName()
if (this.scene.currentBattle.double) { if (this.scene.currentBattle.double) {
var targIDs = ["Counter", "Self", "Ally", "L", "R"] var targIDs = ["Counter", "Self", "Ally", "L", "R"]
if (pokemon.getBattlerIndex() == 1) targIDs = ["Counter", "Ally", "Self", "L", "R"] if (pokemon.getBattlerIndex() == 1) targIDs = ["Counter", "Ally", "Self", "L", "R"]
switch (mv.getMove().moveTarget) { LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
case MoveTarget.USER: } else {
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) var targIDs = ["Counter", "", "", "", ""]
break; var myField = this.scene.getField()
case MoveTarget.OTHER: if (myField[0])
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) targIDs[1] = myField[0].name
break; if (myField[1])
case MoveTarget.ALL_OTHERS: targIDs[2] = myField[1].name
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) var eField = this.scene.getEnemyField()
break; if (eField[0])
case MoveTarget.NEAR_OTHER: targIDs[3] = eField[0].name
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) if (eField[1])
break; targIDs[4] = eField[1].name
case MoveTarget.ALL_NEAR_OTHERS: //LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break;
case MoveTarget.NEAR_ENEMY:
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break;
case MoveTarget.ALL_NEAR_ENEMIES:
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break;
case MoveTarget.RANDOM_NEAR_ENEMY:
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break;
case MoveTarget.ALL_ENEMIES:
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break;
case MoveTarget.ATTACKER:
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break;
case MoveTarget.NEAR_ALLY:
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break;
case MoveTarget.ALLY:
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break;
case MoveTarget.USER_OR_NEAR_ALLY:
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break;
case MoveTarget.USER_AND_ALLIES:
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break;
case MoveTarget.ALL:
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break;
case MoveTarget.USER_SIDE:
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break;
case MoveTarget.ENEMY_SIDE:
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break;
case MoveTarget.BOTH_SIDES:
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break;
case MoveTarget.PARTY:
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break;
case MoveTarget.CURSE:
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break;
}
} }
console.log(mv.getName(), targets) console.log(mv.getName(), targets)
} }
} else { } else {
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 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)
}
this.scene.pushPhase(playerPhase); this.scene.pushPhase(playerPhase);
} }
} 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 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: