From 9e442f2b0782c84b1e180aa796da4271a20fa45e Mon Sep 17 00:00:00 2001 From: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com> Date: Fri, 12 Jul 2024 22:12:32 -0400 Subject: [PATCH] more fixes --- src/logger.ts | 2 +- src/phases.ts | 33 ++++++++++++++++++--------------- src/ui/arena-flyout.ts | 4 ++-- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/logger.ts b/src/logger.ts index a65d824703a..b05fdd86b15 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -353,7 +353,7 @@ export function getSize(str: string) { export function getDRPD(scene: BattleScene): DRPD { var drpd: DRPD = JSON.parse(localStorage.getItem(getLogID(scene))) as DRPD; drpd = updateLog(drpd); - scene.arenaFlyout.updateFieldText() + //scene.arenaFlyout.updateFieldText() return drpd; } diff --git a/src/phases.ts b/src/phases.ts index 046ab6dc385..413a30cf5b7 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -2368,6 +2368,8 @@ export class TurnInitPhase extends FieldPhase { }) } + this.scene.arenaFlyout.updateFieldText() + this.scene.setScoreText(txt.join("/")) this.end(); @@ -2876,35 +2878,34 @@ export class TurnStartPhase extends FieldPhase { if (pokemon.getBattlerIndex() == 1) targIDs = ["Counter", "Ally", "Self", "L", "R"] switch (mv.getMove().moveTarget) { case MoveTarget.USER: - //LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) + LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) break; case MoveTarget.OTHER: LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) break; case MoveTarget.ALL_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_OTHER: LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) break; 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]) + 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]) + 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]) + 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; + 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]) @@ -2916,25 +2917,25 @@ export class TurnStartPhase extends FieldPhase { 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]) + LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) break; case MoveTarget.ALL: - //LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) + 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]) + 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]) + 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]) + LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) break; case MoveTarget.PARTY: - //LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) + LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) break; case MoveTarget.CURSE: - //LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) + LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) break; } } @@ -3045,6 +3046,8 @@ export class TurnEndPhase extends FieldPhase { start() { super.start(); + this.scene.arenaFlyout.updateFieldText() + this.scene.currentBattle.incrementTurn(this.scene); this.scene.eventTarget.dispatchEvent(new TurnEndEvent(this.scene.currentBattle.turn)); diff --git a/src/ui/arena-flyout.ts b/src/ui/arena-flyout.ts index 499773f63c6..e80ebd18478 100644 --- a/src/ui/arena-flyout.ts +++ b/src/ui/arena-flyout.ts @@ -272,7 +272,7 @@ export default class ArenaFlyout extends Phaser.GameObjects.Container { this.flyoutTextHeaderField.text = "Stats" this.flyoutTextHeaderPlayer.text = "" this.flyoutTextHeaderEnemy.text = "" - this.flyoutTextPlayer.setPosition(6, 5) + this.flyoutTextPlayer.setPosition(6, 4) this.flyoutTextPlayer.setFontSize(30); var instructions = [] var drpd = LoggerTools.getDRPD(this.scene as BattleScene); @@ -290,7 +290,7 @@ export default class ArenaFlyout extends Phaser.GameObjects.Container { instructions.push("Reward: " + drpd.waves[i].shop) } } - for (var i = instructions.length - 8; i < instructions.length; i++) { + for (var i = instructions.length - 10; i < instructions.length; i++) { if (i >= 0) { this.flyoutTextPlayer.text += instructions[i] }