From 07593945eefa44bc0a2f3d40bca4500b7e07b422 Mon Sep 17 00:00:00 2001 From: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com> Date: Sat, 20 Jul 2024 16:01:37 -0400 Subject: [PATCH] Revert "Auto correct date" This reverts commit 4e3fbe0c01a4dc6282376a63cb0bc0a416aca440. --- src/logger.ts | 8 -------- src/phases.ts | 13 +++---------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/logger.ts b/src/logger.ts index 7ef6c4e871a..06321628659 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -348,13 +348,6 @@ export function enemyPokeName(scene: BattleScene, index: integer | Pokemon | Ene * @see DRPD */ function updateLog(drpd: DRPD): DRPD { - if (drpd.date[2] == "-") { - var date_month = drpd.date.substring(0, 2) - var date_day = drpd.date.substring(3, 5) - var date_year = drpd.date.substring(6, 10) - console.log(`Corrected date from ${drpd.date} to ${date_year}-${date_month}-${date_day}`) - drpd.date = `${date_year}-${date_month}-${date_day}` - } if (drpd.version == "1.0.0") { drpd.version = "1.0.0a" console.log("Updated to 1.0.0a - changed item IDs to strings") @@ -1228,7 +1221,6 @@ export function setFileInfo(title: string, authors: string[]) { console.log("Setting file " + rarityslot[1] + " to " + title + " / [" + authors.join(", ") + "]") var fileID = rarityslot[1] as string var drpd = JSON.parse(localStorage.getItem(fileID)) as DRPD; - drpd = updateLog(drpd) drpd.title = title; for (var i = 0; i < authors.length; i++) { while (authors[i][0] == " ") { diff --git a/src/phases.ts b/src/phases.ts index fe2205fdd03..7673d48b671 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -1571,7 +1571,7 @@ export class EncounterPhase extends BattlePhase { LoggerTools.resetWaveActions(this.scene, undefined, true) if (LoggerTools.autoCheckpoints.includes(this.scene.currentBattle.waveIndex)) { - //this.scene.gameData.saveGameToAuto(this.scene) + this.scene.gameData.saveGameToAuto(this.scene) } if (this.scene.currentBattle.battleType === BattleType.WILD) { @@ -2678,15 +2678,8 @@ export class TurnInitPhase extends FieldPhase { }); var Pt = this.scene.getEnemyParty() - var Pt1 = [] - var Pt2 = [] - for (var i = 0; i < Pt.length; i++) { - if (i % 2 == 0) { - Pt1.push(Pt[i]) - } else { - Pt2.push(Pt[i]) - } - } + var Pt1 = [this.scene.getEnemyParty()[0], this.scene.getEnemyParty()[2], this.scene.getEnemyParty()[4]] + var Pt2 = [this.scene.getEnemyParty()[1], this.scene.getEnemyParty()[3], this.scene.getEnemyParty()[5]] Pt.forEach((pokemon, i) => { if (pokemon != undefined) if (pokemon.hasTrainer() || true) {