From c4659d64670b2a8dcd190635058acee0a7f8105c Mon Sep 17 00:00:00 2001 From: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com> Date: Fri, 12 Jul 2024 21:58:55 -0400 Subject: [PATCH] update --- src/logger.ts | 29 ++++++++++++++--------------- src/ui/arena-flyout.ts | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 15 deletions(-) diff --git a/src/logger.ts b/src/logger.ts index d6a23adc3d3..3fc9e85fcc1 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -350,6 +350,13 @@ export function getSize(str: string) { return d.toString() + filesizes[unit] } +export function getDRPD(scene: BattleScene): DRPD { + var drpd: DRPD = JSON.parse(localStorage.getItem(getLogID(scene))) as DRPD; + drpd = updateLog(drpd); + scene.arenaFlyout.printIVs() + return drpd; +} + /** * Generates a UI option to save a log to your device. * @param i The slot number. Corresponds to an index in `logs`. @@ -559,8 +566,7 @@ export function logTeam(scene: BattleScene, floor: integer = undefined) { */ export function logActions(scene: BattleScene, floor: integer, action: string) { if (localStorage.getItem(getLogID(scene)) == null) localStorage.setItem(getLogID(scene), JSON.stringify(newDocument(getMode(scene) + " Run"))) - var drpd: DRPD = JSON.parse(localStorage.getItem(getLogID(scene))) as DRPD; - drpd = updateLog(drpd); + var drpd = getDRPD(scene) console.log("Log Action", drpd) var wv: Wave = getWave(drpd, floor, scene) wv.actions.push(action) @@ -575,8 +581,7 @@ export function logActions(scene: BattleScene, floor: integer, action: string) { */ export function logShop(scene: BattleScene, floor: integer, action: string) { if (localStorage.getItem(getLogID(scene)) == null) localStorage.setItem(getLogID(scene), JSON.stringify(newDocument(getMode(scene) + " Run"))) - var drpd: DRPD = JSON.parse(localStorage.getItem(getLogID(scene))) as DRPD; - drpd = updateLog(drpd); + var drpd = getDRPD(scene) console.log("Log Shop Item", drpd) var wv: Wave = getWave(drpd, floor, scene) wv.shop = action @@ -741,8 +746,7 @@ function checkForPokeInBiome(species: Species, pool: (Species | SpeciesTree)[]): export function logPokemon(scene: BattleScene, floor: integer = undefined, slot: integer, pokemon: EnemyPokemon, encounterRarity?: string) { if (floor == undefined) floor = scene.currentBattle.waveIndex if (localStorage.getItem(getLogID(scene)) == null) localStorage.setItem(getLogID(scene), JSON.stringify(newDocument(getMode(scene) + " Run"))) - var drpd: DRPD = JSON.parse(localStorage.getItem(getLogID(scene))) as DRPD; - drpd = updateLog(drpd); + var drpd = getDRPD(scene) console.log("Log Enemy Pokemon", drpd) var wv: Wave = getWave(drpd, floor, scene) var pk: PokeData = exportPokemon(pokemon, encounterRarity) @@ -816,8 +820,7 @@ export function logPokemon(scene: BattleScene, floor: integer = undefined, slot: export function resetWaveActions(scene: BattleScene, floor: integer = undefined) { if (floor == undefined) floor = scene.currentBattle.waveIndex if (localStorage.getItem(getLogID(scene)) == null) localStorage.setItem(getLogID(scene), JSON.stringify(newDocument(getMode(scene) + " Run"))) - var drpd: DRPD = JSON.parse(localStorage.getItem(getLogID(scene))) as DRPD; - drpd = updateLog(drpd); + var drpd = getDRPD(scene) console.log("Clear Actions", drpd) var wv: Wave = getWave(drpd, floor, scene) wv.actions = [] @@ -850,9 +853,7 @@ export function logTrainer(scene: BattleScene, floor: integer = undefined) { */ export function logPlayerTeam(scene: BattleScene) { if (localStorage.getItem(getLogID(scene)) == null) localStorage.setItem(getLogID(scene), JSON.stringify(newDocument(getMode(scene) + " Run"))) - var drpd: DRPD = JSON.parse(localStorage.getItem(getLogID(scene))) as DRPD; - //var wv: Wave = getWave(drpd, 1, scene) - drpd = updateLog(drpd); + var drpd = getDRPD(scene) console.log("Log Player Starters", drpd) var P = scene.getParty() for (var i = 0; i < P.length; i++) { @@ -961,8 +962,7 @@ export function flagReset(scene: BattleScene, floor: integer = undefined) { floor = scene.currentBattle.waveIndex; if (localStorage.getItem(getLogID(scene)) == null) localStorage.setItem(getLogID(scene), JSON.stringify(newDocument(getMode(scene) + " Run"))) - var drpd: DRPD = JSON.parse(localStorage.getItem(getLogID(scene))) as DRPD; - drpd = updateLog(drpd); + var drpd = getDRPD(scene) var wv = getWave(drpd, floor, scene) wv.reload = true; console.log(drpd) @@ -973,8 +973,7 @@ export function flagResetIfExists(scene: BattleScene, floor: integer = undefined floor = scene.currentBattle.waveIndex; if (localStorage.getItem(getLogID(scene)) == null) localStorage.setItem(getLogID(scene), JSON.stringify(newDocument(getMode(scene) + " Run"))) - var drpd: DRPD = JSON.parse(localStorage.getItem(getLogID(scene))) as DRPD; - drpd = updateLog(drpd); + var drpd = getDRPD(scene) var waveExists = false for (var i = 0; i < drpd.waves.length; i++) { if (drpd.waves[i] != undefined) { diff --git a/src/ui/arena-flyout.ts b/src/ui/arena-flyout.ts index fbd67d9521a..499773f63c6 100644 --- a/src/ui/arena-flyout.ts +++ b/src/ui/arena-flyout.ts @@ -10,6 +10,8 @@ import { ArenaTagType } from "#enums/arena-tag-type"; import TimeOfDayWidget from "./time-of-day-widget"; import * as Utils from "../utils"; import { getNatureDecrease, getNatureIncrease, getNatureName } from "#app/data/nature.js"; +import * as LoggerTools from "../logger" +import { BattleEndPhase } from "#app/phases.js"; /** Enum used to differentiate {@linkcode Arena} effects */ enum ArenaEffectType { @@ -192,9 +194,12 @@ export default class ArenaFlyout extends Phaser.GameObjects.Container { this.flyoutTextPlayer.text = ""; this.flyoutTextField.text = ""; this.flyoutTextEnemy.text = ""; + this.flyoutTextPlayer.setPosition(6, 13) + this.flyoutTextPlayer.setFontSize(48); } public printIVs() { + this.clearText() var poke = (this.scene as BattleScene).getEnemyField() this.flyoutTextPlayer.text = "" this.flyoutTextField.text = "" @@ -261,6 +266,36 @@ export default class ArenaFlyout extends Phaser.GameObjects.Container { textObject.text += "\n"; } + this.flyoutTextPlayer.text = "" + this.flyoutTextField.text = "" + this.flyoutTextEnemy.text = "" + this.flyoutTextHeaderField.text = "Stats" + this.flyoutTextHeaderPlayer.text = "" + this.flyoutTextHeaderEnemy.text = "" + this.flyoutTextPlayer.setPosition(6, 5) + this.flyoutTextPlayer.setFontSize(30); + var instructions = [] + var drpd = LoggerTools.getDRPD(this.scene as BattleScene); + var doWaveInstructions = true; + for (var i = 0; i < drpd.waves.length && drpd.waves[i] != undefined && doWaveInstructions; i++) { + if (drpd.waves[i].id > (this.scene as BattleScene).currentBattle.waveIndex) { + doWaveInstructions = false; + } else { + instructions.push("") + instructions.push("Wave " + drpd.waves[i].id) + for (var j = 0; j < drpd.waves[i].actions.length; j++) { + instructions.push("- " + drpd.waves[i].actions[j]) + } + if (drpd.waves[i].shop != "") + instructions.push("Reward: " + drpd.waves[i].shop) + } + } + for (var i = instructions.length - 8; i < instructions.length; i++) { + if (i >= 0) { + this.flyoutTextPlayer.text += instructions[i] + } + this.flyoutTextPlayer.text += "\n" + } } /**