mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-26 09:19:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Some extra fixes

Browse Source
This commit is contained in:
RedstonewolfX 2024-09-03 11:07:12 -04:00 committed by GitHub
commit ae5570cd17
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/logger.ts
View File

@ -614,12 +614,14 @@ function updateLog(drpd: DRPD): DRPD {
for (var i = 0; i < drpd.waves.length; i++) { for (var i = 0; i < drpd.waves.length; i++) {
if (drpd.waves[i] && drpd.waves[i].pokemon) { if (drpd.waves[i] && drpd.waves[i].pokemon) {
for (var j = 0; j < drpd.waves[i].pokemon!.length; j++) { for (var j = 0; j < drpd.waves[i].pokemon!.length; j++) {
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].iv_raw = drpd.waves[i].pokemon![j].ivs!
drpd.waves[i].pokemon![j].ivs = undefined drpd.waves[i].pokemon![j].ivs = undefined
drpd.waves[i].pokemon![j].iv = formatIVs(drpd.waves[i].pokemon![j].ivs!) drpd.waves[i].pokemon![j].iv = formatIVs(drpd.waves[i].pokemon![j].ivs!)
} }
} }
} }
}
} // 1.1.0a → 1.1.0b } // 1.1.0a → 1.1.0b
return drpd; return drpd;
} }

9
src/phases/turn-start-phase.ts
View File

@ -221,6 +221,15 @@ export class TurnStartPhase extends FieldPhase {
this.scene.pushPhase(new BerryPhase(this.scene)); this.scene.pushPhase(new BerryPhase(this.scene));
this.scene.pushPhase(new TurnEndPhase(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 * 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 * of the queue and dequeues to start the next phase

3
src/ui/arena-flyout.ts
View File

@ -11,8 +11,7 @@ import TimeOfDayWidget from "./time-of-day-widget";
import * as Utils from "../utils"; import * as Utils from "../utils";
import i18next, {ParseKeys} from "i18next"; import i18next, {ParseKeys} from "i18next";
import { getNatureDecrease, getNatureIncrease, getNatureName } from "#app/data/nature.js"; import { getNatureDecrease, getNatureIncrease, getNatureName } from "#app/data/nature.js";
import * as LoggerTools from "../logger" import * as LoggerTools from "../logger";
import { BattleEndPhase } from "#app/phases.js";
import { Gender } from "#app/data/gender.js"; import { Gender } from "#app/data/gender.js";
import { getBiomeName } from "#app/data/biomes.js"; import { getBiomeName } from "#app/data/biomes.js";
import { getLuckString } from "#app/modifier/modifier-type.js"; import { getLuckString } from "#app/modifier/modifier-type.js";