Fixed SaveSessionData issue + Added loss details + removed Modifiers
This commit is contained in:
Frutescens
parent
07b1cf8382
commit
4fd321790a
|
|
@ -1101,7 +1101,7 @@ export class GameData {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
parseSessionData(dataStr: string): SessionSaveData {
|
public parseSessionData(dataStr: string): SessionSaveData {
|
||||||
return JSON.parse(dataStr, (k: string, v: any) => {
|
return JSON.parse(dataStr, (k: string, v: any) => {
|
||||||
/*const versions = [ scene.game.config.gameVersion, sessionData.gameVersion || '0.0.0' ];
|
/*const versions = [ scene.game.config.gameVersion, sessionData.gameVersion || '0.0.0' ];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,326 @@
|
||||||
|
import BattleScene from "../battle-scene";
|
||||||
|
import { gameModes } from "../game-mode";
|
||||||
|
import { SessionSaveData, parseSessionData, RunHistoryData, RunEntries } from "../system/game-data";
|
||||||
|
import { TextStyle, addTextObject } from "./text";
|
||||||
|
import { Mode } from "./ui";
|
||||||
|
import { addWindow } from "./ui-theme";
|
||||||
|
import * as Utils from "../utils";
|
||||||
|
import { PokemonData } from "../system/pokemon-data";
|
||||||
|
import { TrainerData } from "../system/trainer-data"
|
||||||
|
import Pokemon, { EnemyPokemon, PlayerPokemon } from "../field/pokemon";
|
||||||
|
import { PokemonHeldItemModifier } from "../modifier/modifier";
|
||||||
|
import MessageUiHandler from "./message-ui-handler";
|
||||||
|
import i18next from "i18next";
|
||||||
|
import {Button} from "../enums/buttons";
|
||||||
|
import { BattleType } from "../battle";
|
||||||
|
import {TrainerType} from "../data/enums/trainer-type";
|
||||||
|
|
||||||
|
export const runCount = 25;
|
||||||
|
|
||||||
|
export type RunSelectCallback = (cursor: integer) => void;
|
||||||
|
|
||||||
|
export default class RunHistoryUiHandler extends MessageUiHandler {
|
||||||
|
|
||||||
|
private runSelectContainer: Phaser.GameObjects.Container;
|
||||||
|
private runsContainer: Phaser.GameObjects.Container;
|
||||||
|
private runSelectMessageBox: Phaser.GameObjects.NineSlice;
|
||||||
|
private runSelectMessageBoxContainer: Phaser.GameObjects.Container;
|
||||||
|
private runs: runEntry[];
|
||||||
|
|
||||||
|
private uiMode: RunHistoryUiMode;
|
||||||
|
private runSelectCallback: RunSelectCallback;
|
||||||
|
|
||||||
|
private scrollCursor: integer = 0;
|
||||||
|
|
||||||
|
private cursorObj: Phaser.GameObjects.NineSlice;
|
||||||
|
|
||||||
|
private runContainerInitialY: number;
|
||||||
|
|
||||||
|
constructor(scene: BattleScene) {
|
||||||
|
super(scene, Mode.RUN_HISTORY);
|
||||||
|
}
|
||||||
|
|
||||||
|
setup() {
|
||||||
|
const ui = this.getUi();
|
||||||
|
|
||||||
|
this.runSelectContainer = this.scene.add.container(0, 0);
|
||||||
|
this.runSelectContainer.setVisible(false);
|
||||||
|
ui.add(this.runSelectContainer);
|
||||||
|
|
||||||
|
const loadSessionBg = this.scene.add.rectangle(0, 0, this.scene.game.canvas.width / 6, -this.scene.game.canvas.height / 6, 0x006860);
|
||||||
|
loadSessionBg.setOrigin(0, 0);
|
||||||
|
this.runSelectContainer.add(loadSessionBg);
|
||||||
|
|
||||||
|
this.runContainerInitialY = -this.scene.game.canvas.height / 6 + 8;
|
||||||
|
|
||||||
|
this.runsContainer = this.scene.add.container(8, this.runContainerInitialY);
|
||||||
|
this.runSelectContainer.add(this.runsContainer);
|
||||||
|
|
||||||
|
this.runSelectMessageBoxContainer = this.scene.add.container(0, 0);
|
||||||
|
this.runSelectMessageBoxContainer.setVisible(false);
|
||||||
|
this.runSelectContainer.add(this.runSelectMessageBoxContainer);
|
||||||
|
|
||||||
|
this.runSelectMessageBox = addWindow(this.scene, 1, -1, 318, 28);
|
||||||
|
this.runSelectMessageBox.setOrigin(0, 1);
|
||||||
|
this.runSelectMessageBoxContainer.add(this.runSelectMessageBox);
|
||||||
|
|
||||||
|
this.message = addTextObject(this.scene, 8, 8, "", TextStyle.WINDOW, { maxLines: 2 });
|
||||||
|
this.message.setOrigin(0, 0);
|
||||||
|
this.runSelectMessageBoxContainer.add(this.message);
|
||||||
|
|
||||||
|
this.runs = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
show(args: any[]): boolean {
|
||||||
|
super.show(args);
|
||||||
|
|
||||||
|
this.getUi().bringToTop(this.runSelectContainer);
|
||||||
|
this.runSelectContainer.setVisible(true);
|
||||||
|
this.populateruns();
|
||||||
|
|
||||||
|
this.setScrollCursor(0);
|
||||||
|
this.setCursor(0);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
processInput(button: Button): boolean {
|
||||||
|
const ui = this.getUi();
|
||||||
|
|
||||||
|
let success = false;
|
||||||
|
const error = false;
|
||||||
|
|
||||||
|
if (button === Button.ACTION || button === Button.CANCEL) {
|
||||||
|
const originalCallback = this.runSelectCallback;
|
||||||
|
if (button === Button.ACTION) {
|
||||||
|
const cursor = this.cursor + this.scrollCursor;
|
||||||
|
console.log("Action --> page with more detailed run information");
|
||||||
|
success = true;
|
||||||
|
return success;
|
||||||
|
} else {
|
||||||
|
this.runSelectCallback = null;
|
||||||
|
success = true;
|
||||||
|
this.scene.ui.revertMode();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
switch (button) {
|
||||||
|
case Button.UP:
|
||||||
|
if (this.cursor) {
|
||||||
|
success = this.setCursor(this.cursor - 1);
|
||||||
|
} else if (this.scrollCursor) {
|
||||||
|
success = this.setScrollCursor(this.scrollCursor - 1);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case Button.DOWN:
|
||||||
|
if (this.cursor < 2) {
|
||||||
|
success = this.setCursor(this.cursor + 1);
|
||||||
|
} else if (this.scrollCursor < runCount - 3) {
|
||||||
|
success = this.setScrollCursor(this.scrollCursor + 1);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (success) {
|
||||||
|
ui.playSelect();
|
||||||
|
} else if (error) {
|
||||||
|
ui.playError();
|
||||||
|
}
|
||||||
|
return success || error;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
populateruns() {
|
||||||
|
const timestamps = Object.keys(this.scene.gameData.runHistory);
|
||||||
|
if (timestamps.length > 1) {
|
||||||
|
timestamps.sort((a, b) => a - b);
|
||||||
|
}
|
||||||
|
const entryCount = timestamps.length;
|
||||||
|
console.log(entryCount);
|
||||||
|
for (let s = 0; s < entryCount; s++) {
|
||||||
|
const entry = new RunEntry(this.scene, timestamps[s], s);
|
||||||
|
this.scene.add.existing(entry);
|
||||||
|
this.runsContainer.add(entry);
|
||||||
|
this.runs.push(entry);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
showText(text: string, delay?: integer, callback?: Function, callbackDelay?: integer, prompt?: boolean, promptDelay?: integer) {
|
||||||
|
super.showText(text, delay, callback, callbackDelay, prompt, promptDelay);
|
||||||
|
|
||||||
|
if (text?.indexOf("\n") === -1) {
|
||||||
|
this.runSelectMessageBox.setSize(318, 28);
|
||||||
|
this.message.setY(-22);
|
||||||
|
} else {
|
||||||
|
this.runSelectMessageBox.setSize(318, 42);
|
||||||
|
this.message.setY(-37);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.runSelectMessageBoxContainer.setVisible(!!text?.length);
|
||||||
|
}
|
||||||
|
|
||||||
|
setCursor(cursor: integer): boolean {
|
||||||
|
const changed = super.setCursor(cursor);
|
||||||
|
|
||||||
|
if (!this.cursorObj) {
|
||||||
|
this.cursorObj = this.scene.add.nineslice(0, 0, "select_cursor_highlight_thick", null, 296, 44, 6, 6, 6, 6);
|
||||||
|
this.cursorObj.setOrigin(0, 0);
|
||||||
|
this.runsContainer.add(this.cursorObj);
|
||||||
|
}
|
||||||
|
this.cursorObj.setPosition(4, 4 + (cursor + this.scrollCursor) * 56);
|
||||||
|
|
||||||
|
return changed;
|
||||||
|
}
|
||||||
|
|
||||||
|
setScrollCursor(scrollCursor: integer): boolean {
|
||||||
|
const changed = scrollCursor !== this.scrollCursor;
|
||||||
|
|
||||||
|
if (changed) {
|
||||||
|
this.scrollCursor = scrollCursor;
|
||||||
|
this.setCursor(this.cursor);
|
||||||
|
this.scene.tweens.add({
|
||||||
|
targets: this.runsContainer,
|
||||||
|
y: this.runContainerInitialY - 56 * scrollCursor,
|
||||||
|
duration: Utils.fixedInt(325),
|
||||||
|
ease: "Sine.easeInOut"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return changed;
|
||||||
|
}
|
||||||
|
|
||||||
|
clear() {
|
||||||
|
super.clear();
|
||||||
|
this.runSelectContainer.setVisible(false);
|
||||||
|
this.eraseCursor();
|
||||||
|
this.runSelectCallback = null;
|
||||||
|
this.clearruns();
|
||||||
|
}
|
||||||
|
|
||||||
|
eraseCursor() {
|
||||||
|
if (this.cursorObj) {
|
||||||
|
this.cursorObj.destroy();
|
||||||
|
}
|
||||||
|
this.cursorObj = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
clearruns() {
|
||||||
|
this.runs.splice(0, this.runs.length);
|
||||||
|
this.runsContainer.removeAll(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class RunEntry extends Phaser.GameObjects.Container {
|
||||||
|
public slotId: integer;
|
||||||
|
public hasData: boolean;
|
||||||
|
private loadingLabel: Phaser.GameObjects.Text;
|
||||||
|
|
||||||
|
constructor(scene: BattleScene, timestamp: string, slotId: integer) {
|
||||||
|
super(scene, 0, slotId*56);
|
||||||
|
|
||||||
|
this.slotId = slotId;
|
||||||
|
|
||||||
|
this.setup(this.scene.gameData.runHistory[timestamp]);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
setup(run: RunHistoryData) {
|
||||||
|
|
||||||
|
const victory = run.victory;
|
||||||
|
const data = this.scene.gameData.parseSessionData(JSON.stringify(run.entry));
|
||||||
|
console.log(data);
|
||||||
|
|
||||||
|
const slotWindow = addWindow(this.scene, 0, 0, 304, 52);
|
||||||
|
this.add(slotWindow);
|
||||||
|
|
||||||
|
|
||||||
|
if (victory) {
|
||||||
|
const gameOutcomeLabel = addTextObject(this.scene, 8, 5, "Victory", TextStyle.WINDOW);
|
||||||
|
this.add(gameOutcomeLabel);
|
||||||
|
} else {
|
||||||
|
if (data.battleType === BattleType.WILD) {
|
||||||
|
const enemyContainer = this.scene.add.container(8,5);
|
||||||
|
const gameOutcomeLabel = addTextObject(this.scene, 0, 0, "Defeated by ", TextStyle.WINDOW);
|
||||||
|
enemyContainer.add(gameOutcomeLabel);
|
||||||
|
const enemyIconContainer = this.scene.add.container(58,-8);
|
||||||
|
enemyIconContainer.setScale(0.75);
|
||||||
|
data.enemyParty.forEach((enemyData, e) => {
|
||||||
|
const enemy = enemyData.toPokemon(this.scene);
|
||||||
|
const enemyIcon = this.scene.addPokemonIcon(enemy, 0, 0, 0, 0);
|
||||||
|
const enemyLevel = addTextObject(this.scene, 32, 20, `Lv${Utils.formatLargeNumber(enemy.level, 1000)}`, TextStyle.PARTY, { fontSize: "54px", color: "#f8f8f8" });
|
||||||
|
enemyLevel.setShadow(0, 0, null);
|
||||||
|
enemyLevel.setStroke("#424242", 14);
|
||||||
|
enemyLevel.setOrigin(1, 0);
|
||||||
|
enemyIconContainer.add(enemyIcon);
|
||||||
|
enemyIconContainer.add(enemyLevel);
|
||||||
|
enemyContainer.add(enemyIconContainer);
|
||||||
|
enemy.destroy();
|
||||||
|
});
|
||||||
|
this.add(enemyContainer);
|
||||||
|
}
|
||||||
|
else if (data.battleType === BattleType.TRAINER) {
|
||||||
|
const tObj = data.trainer.toTrainer(this.scene);
|
||||||
|
const tType = TrainerType[data.trainer.trainerType];
|
||||||
|
const gameOutcomeLabel = addTextObject(this.scene, 8, 5, `Defeated by ${tType.charAt(0)+tType.substring(1).toLowerCase()}`, TextStyle.WINDOW);
|
||||||
|
this.add(gameOutcomeLabel);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const gameModeLabel = addTextObject(this.scene, 8, 19, `${gameModes[data.gameMode]?.getName() || "Unknown"} - Wave ${data.waveIndex}`, TextStyle.WINDOW);
|
||||||
|
this.add(gameModeLabel);
|
||||||
|
|
||||||
|
const timestampLabel = addTextObject(this.scene, 8, 33, new Date(data.timestamp).toLocaleString(), TextStyle.WINDOW);
|
||||||
|
this.add(timestampLabel);
|
||||||
|
|
||||||
|
const pokemonIconsContainer = this.scene.add.container(144, 4);
|
||||||
|
|
||||||
|
data.party.forEach((p: PokemonData, i: integer) => {
|
||||||
|
const iconContainer = this.scene.add.container(26 * i, 0);
|
||||||
|
iconContainer.setScale(0.75);
|
||||||
|
const pokemon = p.toPokemon(this.scene);
|
||||||
|
const icon = this.scene.addPokemonIcon(pokemon, 0, 0, 0, 0);
|
||||||
|
|
||||||
|
const text = addTextObject(this.scene, 32, 20, `Lv${Utils.formatLargeNumber(pokemon.level, 1000)}`, TextStyle.PARTY, { fontSize: "54px", color: "#f8f8f8" });
|
||||||
|
text.setShadow(0, 0, null);
|
||||||
|
text.setStroke("#424242", 14);
|
||||||
|
text.setOrigin(1, 0);
|
||||||
|
|
||||||
|
iconContainer.add(icon);
|
||||||
|
iconContainer.add(text);
|
||||||
|
|
||||||
|
pokemonIconsContainer.add(iconContainer);
|
||||||
|
|
||||||
|
pokemon.destroy();
|
||||||
|
});
|
||||||
|
|
||||||
|
this.add(pokemonIconsContainer);
|
||||||
|
|
||||||
|
/*
|
||||||
|
const modifiersModule = import("../modifier/modifier");
|
||||||
|
|
||||||
|
const modifierIconsContainer = this.scene.add.container(148, 30);
|
||||||
|
modifierIconsContainer.setScale(0.5);
|
||||||
|
let visibleModifierIndex = 0;
|
||||||
|
for (const m of data.modifiers) {
|
||||||
|
const modifier = m.toModifier(this.scene, modifiersModule[m.className]);
|
||||||
|
if (modifier instanceof PokemonHeldItemModifier) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const icon = modifier.getIcon(this.scene, false);
|
||||||
|
icon.setPosition(24 * visibleModifierIndex, 0);
|
||||||
|
modifierIconsContainer.add(icon);
|
||||||
|
if (++visibleModifierIndex === 12) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.add(modifierIconsContainer);
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
interface RunEntry {
|
||||||
|
scene: BattleScene;
|
||||||
|
}
|
||||||
|
|
||||||
Loading…
Reference in New Issue