From 763ec3c1c074736a99bf7916afc75e8039e32ce6 Mon Sep 17 00:00:00 2001 From: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com> Date: Tue, 3 Sep 2024 11:03:18 -0400 Subject: [PATCH 1/2] Update logger.ts Prevents logs updated at a certain time from causing a game crash --- src/logger.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/logger.ts b/src/logger.ts index db7532b394f..9d2b85855d0 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -614,9 +614,11 @@ function updateLog(drpd: DRPD): DRPD { for (var i = 0; i < drpd.waves.length; i++) { if (drpd.waves[i] && drpd.waves[i].pokemon) { for (var j = 0; j < drpd.waves[i].pokemon!.length; j++) { - drpd.waves[i].pokemon![j].iv_raw = drpd.waves[i].pokemon![j].ivs! - drpd.waves[i].pokemon![j].ivs = undefined - drpd.waves[i].pokemon![j].iv = formatIVs(drpd.waves[i].pokemon![j].ivs!) + if (drpd.waves[i].pokemon![j].ivs) { + drpd.waves[i].pokemon![j].iv_raw = drpd.waves[i].pokemon![j].ivs! + drpd.waves[i].pokemon![j].ivs = undefined + drpd.waves[i].pokemon![j].iv = formatIVs(drpd.waves[i].pokemon![j].ivs!) + } } } } From f5cea9896c5aed0afa1cf2e4649cab194ef910fe Mon Sep 17 00:00:00 2001 From: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com> Date: Tue, 3 Sep 2024 11:05:18 -0400 Subject: [PATCH 2/2] Fix Logger Logging tool now does its job Removed unnecessary import in `arena-flyout.ts` that was showing an error in the editor --- src/phases/turn-start-phase.ts | 9 +++++++++ src/ui/arena-flyout.ts | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/phases/turn-start-phase.ts b/src/phases/turn-start-phase.ts index 27f8322700c..32f23a476c7 100644 --- a/src/phases/turn-start-phase.ts +++ b/src/phases/turn-start-phase.ts @@ -221,6 +221,15 @@ export class TurnStartPhase extends FieldPhase { this.scene.pushPhase(new BerryPhase(this.scene)); this.scene.pushPhase(new TurnEndPhase(this.scene)); + this.scene.arenaFlyout.updateFieldText(); + + if (LoggerTools.Actions.length > 1 && !this.scene.currentBattle.double) { + LoggerTools.Actions.pop() // If this is a single battle, but we somehow have two actions, delete the second + } + if (LoggerTools.Actions.length > 1 && (LoggerTools.Actions[0] == "" || LoggerTools.Actions[0] == undefined || LoggerTools.Actions[0] == null)) + LoggerTools.Actions.shift() // If the left slot isn't doing anything, delete its entry + LoggerTools.logActions(this.scene, this.scene.currentBattle.waveIndex, LoggerTools.Actions.join(" & ")) + /** * this.end() will call shiftPhase(), which dumps everything from PrependQueue (aka everything that is unshifted()) to the front * of the queue and dequeues to start the next phase diff --git a/src/ui/arena-flyout.ts b/src/ui/arena-flyout.ts index 7763426ca6c..9fd4d4ba09f 100644 --- a/src/ui/arena-flyout.ts +++ b/src/ui/arena-flyout.ts @@ -11,8 +11,7 @@ import TimeOfDayWidget from "./time-of-day-widget"; import * as Utils from "../utils"; import i18next, {ParseKeys} from "i18next"; import { getNatureDecrease, getNatureIncrease, getNatureName } from "#app/data/nature.js"; -import * as LoggerTools from "../logger" -import { BattleEndPhase } from "#app/phases.js"; +import * as LoggerTools from "../logger"; import { Gender } from "#app/data/gender.js"; import { getBiomeName } from "#app/data/biomes.js"; import { getLuckString } from "#app/modifier/modifier-type.js";