Merge remote-tracking branch 'refs/remotes/origin/runHistoryNew' into runHistoryNew

This commit is contained in:
Frutescens 2024-08-02 11:26:27 -07:00
commit 0bf15aff94
13 changed files with 125 additions and 128 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const runHistory: SimpleTranslationEntries = {
"victory": "Sieg!",
"defeatedWild": "Besiegt durch ",
"defeatedTrainer": "Besiegt durch",
"defeatedTrainer": "Besiegt durch ",
"defeatedTrainerDouble": "Besiegt durch Doppelkampf",
"defeatedRival": "Besiegt durch Rivale",
"defeated":"Besiegt",
@ -23,9 +23,9 @@ export const runHistory: SimpleTranslationEntries = {
"playerItems":"Spielergegenstände",
"personalBest":"Persönlicher Bestwert!",
"SPDshortened":"Geschw.",
"runInfo":"Durchlauf Info.",
"runInfo":"Durchlauf Informationen",
"money":"Geld",
"runLength":"Länge des Durchlaufs",
"runLength":"Durchlauf Dauer",
"viewHeldItems":"Getragene Items",
"hallofFameText":"Willkommen in der Ruhmeshalle",
"viewHallOfFame":"Ruhmeshalle ansehen!"

View File

@ -4,7 +4,7 @@ export const menuUiHandler: SimpleTranslationEntries = {
"GAME_SETTINGS": "Paramètres",
"ACHIEVEMENTS": "Succès",
"STATS": "Statistiques",
"RUN_HISTORY": "Run History",
"RUN_HISTORY": "Historique",
"VOUCHERS": "Coupons",
"EGG_LIST": "Liste des Œufs",
"EGG_GACHA": "Gacha-Œufs",
@ -19,10 +19,10 @@ export const menuUiHandler: SimpleTranslationEntries = {
"exportSlotSelect": "Sélectionnez lemplacement depuis lequel exporter les données.",
"importData": "Importer données",
"exportData": "Exporter données",
"linkDiscord": "Lier à Discord",
"unlinkDiscord": "Délier Discord",
"linkGoogle": "Lier à Google",
"unlinkGoogle": "Délier Google",
"linkDiscord": "Link Discord",
"unlinkDiscord": "Unlink Discord",
"linkGoogle": "Link Google",
"unlinkGoogle": "Unlink Google",
"cancel": "Retour",
"losingProgressionWarning": "Vous allez perdre votre progression depuis le début du combat. Continuer ?",
"noEggs": "Vous ne faites actuellement\néclore aucun Œuf !"

View File

@ -1,34 +1,34 @@
import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const runHistory: SimpleTranslationEntries = {
"victory": "Victory!",
"defeatedWild": "Defeated by ",
"defeatedTrainer": "Defeated by ",
"defeatedTrainerDouble": "Defeated by Duo",
"defeatedRival": "Defeated by Rival",
"defeated":"Defeated",
"luck":"Luck",
"victory": "Victoire !",
"defeatedWild": "Battu par ",
"defeatedTrainer": "Battu par ",
"defeatedTrainerDouble": "Battu par Duo",
"defeatedRival": "Battu par Rival",
"defeated":"Vaincu",
"luck":"Chance ",
"score":"Score",
"mode":"Mode",
"challengeRules":"Rule(s)",
"challengeMonoGen1":"Gen I",
"challengeMonoGen2":"Gen II",
"challengeMonoGen3":"Gen III",
"challengeMonoGen4":"Gen IV",
"challengeMonoGen5":"Gen V",
"challengeMonoGen6":"Gen VI",
"challengeMonoGen7":"Gen VII",
"challengeMonoGen8":"Gen VIII",
"challengeMonoGen9":"Gen IX",
"playerItems":"Player Items",
"personalBest":"Personal Best!",
"SPDshortened":"Vel.",
"runInfo":"Run Info",
"money":"Money",
"runLength":"Run Length",
"viewHeldItems":"Held Items",
"hallofFameText":"Welcome to the Hall of Fame!",
"viewHallOfFame":"View Hall of Fame!"
"mode":"Mode ",
"challengeRules":"Règles ",
"challengeMonoGen1":"1G",
"challengeMonoGen2":"2G",
"challengeMonoGen3":"3G",
"challengeMonoGen4":"4G",
"challengeMonoGen5":"5G",
"challengeMonoGen6":"6G",
"challengeMonoGen7":"7G",
"challengeMonoGen8":"8G",
"challengeMonoGen9":"9G",
"playerItems":"Objets joueur",
"personalBest":"Record personnel !",
"SPDshortened":"Vit.",
"runInfo":"Infos session",
"money":"Argent",
"runLength":"Durée session ",
"viewHeldItems":"Objets tenus",
"hallofFameText":"Bienvenue au Panthéon !",
"viewHallOfFame":"Voir le Panthéon !"
} as const;
//Mode Information found in game-mode.ts

View File

@ -4,7 +4,7 @@ export const menuUiHandler: SimpleTranslationEntries = {
"GAME_SETTINGS": "Impostazioni",
"ACHIEVEMENTS": "Obiettivi",
"STATS": "Statistiche",
"RUN_HISTORY": "Run History",
"RUN_HISTORY": "Run precedenti",
"VOUCHERS": "Biglietti",
"EGG_LIST": "Lista uova",
"EGG_GACHA": "Macchine uova",

View File

@ -1,34 +1,34 @@
import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const runHistory: SimpleTranslationEntries = {
"victory": "Victory!",
"defeatedWild": "Defeated by ",
"defeatedTrainer": "Defeated by ",
"defeatedTrainerDouble": "Defeated by Duo",
"defeatedRival": "Defeated by Rival",
"defeated":"Defeated",
"luck":"Luck",
"score":"Score",
"mode":"Mode",
"challengeRules":"Rule(s)",
"challengeMonoGen1":"Gen I",
"challengeMonoGen2":"Gen II",
"challengeMonoGen3":"Gen III",
"challengeMonoGen4":"Gen IV",
"challengeMonoGen5":"Gen V",
"challengeMonoGen6":"Gen VI",
"challengeMonoGen7":"Gen VII",
"challengeMonoGen8":"Gen VIII",
"challengeMonoGen9":"Gen IX",
"playerItems":"Player Items",
"personalBest":"Personal Best!",
"victory": "Vittoria!",
"defeatedWild": "Sconfitti da ",
"defeatedTrainer": "Sconfitti da ",
"defeatedTrainerDouble": "Sconfitti dalla coppia ",
"defeatedRival": "Sconfitti dal rivale",
"defeated":"Sconfitti",
"luck":"Fortuna",
"score":"Punteggio",
"mode":"Modalità",
"challengeRules":"Regola/e",
"challengeMonoGen1":"1ª gen",
"challengeMonoGen2":"2ª gen",
"challengeMonoGen3":"3ª gen",
"challengeMonoGen4":"4ª gen",
"challengeMonoGen5":"5ª gen",
"challengeMonoGen6":"6ª gen",
"challengeMonoGen7":"7ª gen",
"challengeMonoGen8":"8ª gen",
"challengeMonoGen9":"9ª gen",
"playerItems":"Oggetti giocatore",
"personalBest":"Record personale!",
"SPDshortened":"Vel.",
"runInfo":"Run Info",
"money":"Money",
"runLength":"Run Length",
"viewHeldItems":"Held Items",
"hallofFameText":"Welcome to the Hall of Fame!",
"viewHallOfFame":"View Hall of Fame!"
"runInfo":"Info Run",
"money":"Patrimonio",
"runLength":"Durata Run",
"viewHeldItems":"Oggetti equipaggiati ",
"hallofFameText":"Benvenuto alla Sala d'Onore!",
"viewHallOfFame":"Visualizza Sala d'Onore!"
} as const;
//Mode Information found in game-mode.ts

View File

@ -4,7 +4,7 @@ export const menuUiHandler: SimpleTranslationEntries = {
"GAME_SETTINGS": "게임 설정",
"ACHIEVEMENTS": "업적",
"STATS": "통계",
"RUN_HISTORY": "Run History",
"RUN_HISTORY": "플레이 이력",
"VOUCHERS": "바우처",
"EGG_LIST": "알 목록",
"EGG_GACHA": "알 뽑기",

View File

@ -4,7 +4,7 @@ export const menuUiHandler: SimpleTranslationEntries = {
"GAME_SETTINGS": "Configurações",
"ACHIEVEMENTS": "Conquistas",
"STATS": "Estatísticas",
"RUN_HISTORY": "Run History",
"RUN_HISTORY": "Histórico de Jogos",
"VOUCHERS": "Vouchers",
"EGG_LIST": "Incubadora",
"EGG_GACHA": "Gacha de ovos",

View File

@ -1,34 +1,34 @@
import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const runHistory: SimpleTranslationEntries = {
"victory": "Victory!",
"defeatedWild": "Defeated by ",
"defeatedTrainer": "Defeated by ",
"defeatedTrainerDouble": "Defeated by Duo",
"defeatedRival": "Defeated by Rival",
"defeated":"Defeated",
"luck":"Luck",
"score":"Score",
"mode":"Mode",
"challengeRules":"Rule(s)",
"challengeMonoGen1":"Gen I",
"challengeMonoGen2":"Gen II",
"challengeMonoGen3":"Gen III",
"challengeMonoGen4":"Gen IV",
"challengeMonoGen5":"Gen V",
"challengeMonoGen6":"Gen VI",
"challengeMonoGen7":"Gen VII",
"challengeMonoGen8":"Gen VIII",
"challengeMonoGen9":"Gen IX",
"playerItems":"Player Items",
"personalBest":"Personal Best!",
"SPDshortened":"Vel.",
"runInfo":"Run Info",
"money":"Money",
"runLength":"Run Length",
"viewHeldItems":"Held Items",
"hallofFameText":"Welcome to the Hall of Fame!",
"viewHallOfFame":"View Hall of Fame!"
"victory": "Vitória!",
"defeatedWild": "Derrotado por ",
"defeatedTrainer": "Derrotado por ",
"defeatedTrainerDouble": "Derrotado por Dupla",
"defeatedRival": "Derrotado por Rival",
"defeated": "Derrotado",
"luck": "Sorte",
"score": "Pontuação",
"mode": "Modo",
"challengeRules": "Regra(s)",
"challengeMonoGen1": "Ger. 1",
"challengeMonoGen2": "Ger. 2",
"challengeMonoGen3": "Ger. 3",
"challengeMonoGen4": "Ger. 4",
"challengeMonoGen5": "Ger. 5",
"challengeMonoGen6": "Ger. 6",
"challengeMonoGen7": "Ger. 7",
"challengeMonoGen8": "Ger. 8",
"challengeMonoGen9": "Ger. 9",
"playerItems": "Itens do Jogador",
"personalBest": "Recorde Pessoal!",
"SPDshortened": "Vel.",
"runInfo": "Info. do Jogo",
"money": "Dinheiro",
"runLength": "Duração do Jogo",
"viewHeldItems": "Itens Segurados",
"hallofFameText": "Bem-vindo(a) ao Hall da Fama!",
"viewHallOfFame": "Veja o Hall da Fama!"
} as const;
//Mode Information found in game-mode.ts

View File

@ -4,7 +4,7 @@ export const menuUiHandler: SimpleTranslationEntries = {
"GAME_SETTINGS": "游戏设置",
"ACHIEVEMENTS": "成就",
"STATS": "数据统计",
"RUN_HISTORY": "Run History",
"RUN_HISTORY": "历史记录",
"VOUCHERS": "兑换券",
"EGG_LIST": "蛋列表",
"EGG_GACHA": "扭蛋机",

View File

@ -1,34 +1,34 @@
import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const runHistory: SimpleTranslationEntries = {
"victory": "Victory!",
"defeatedWild": "Defeated by ",
"defeatedTrainer": "Defeated by ",
"defeatedTrainerDouble": "Defeated by Duo",
"defeatedRival": "Defeated by Rival",
"defeated":"Defeated",
"luck":"Luck",
"score":"Score",
"mode":"Mode",
"challengeRules":"Rule(s)",
"challengeMonoGen1":"Gen I",
"challengeMonoGen2":"Gen II",
"challengeMonoGen3":"Gen III",
"challengeMonoGen4":"Gen IV",
"challengeMonoGen5":"Gen V",
"challengeMonoGen6":"Gen VI",
"challengeMonoGen7":"Gen VII",
"challengeMonoGen8":"Gen VIII",
"challengeMonoGen9":"Gen IX",
"playerItems":"Player Items",
"personalBest":"Personal Best!",
"SPDshortened":"Vel.",
"runInfo":"Run Info",
"money":"Money",
"runLength":"Run Length",
"viewHeldItems":"Held Items",
"hallofFameText":"Welcome to the Hall of Fame!",
"viewHallOfFame":"View Hall of Fame!"
"victory": "胜利!",
"defeatedWild": "被打败",
"defeatedTrainer": "被打败",
"defeatedTrainerDouble": "被组合打败",
"defeatedRival": "被劲敌打败",
"defeated":"被打败",
"luck":"幸运",
"score":"分数",
"mode":"模式",
"challengeRules":"规则",
"challengeMonoGen1":"一代",
"challengeMonoGen2":"二代",
"challengeMonoGen3":"三代",
"challengeMonoGen4":"四代",
"challengeMonoGen5":"五代",
"challengeMonoGen6":"六代",
"challengeMonoGen7":"七代",
"challengeMonoGen8":"八代",
"challengeMonoGen9":"九代",
"playerItems":"玩家道具",
"personalBest":"个人最佳!",
"SPDshortened":"速率",
"runInfo":"游戏记录",
"money":"金钱",
"runLength":"游戏",
"viewHeldItems":"持有道具",
"hallofFameText":"欢迎来到名人堂!",
"viewHallOfFame":"浏览名人堂!"
} as const;
//Mode Information found in game-mode.ts

View File

@ -90,10 +90,8 @@ export default class RunHistoryUiHandler extends MessageUiHandler {
if (button === Button.ACTION || button === Button.CANCEL) {
if (button === Button.ACTION) {
const cursor = this.cursor + this.scrollCursor;
if (this.runs[cursor]) {
if (this.runs[cursor].hasData) {
this.scene.ui.setOverlayMode(Mode.RUN_INFO, this.runs[cursor].entryData, true);
} else {
return false;
}
success = true;
return success;

View File

@ -564,6 +564,7 @@ export default class GameInfoUiHandler extends UiHandler {
showParty(partyVisible: boolean): void {
const allContainers = this.partyContainer.getAll("name", "PkmnInfo");
allContainers.forEach((c: Phaser.GameObjects.Container) => {
console.log(c.getByName("PkmnMoves"));
(c.getByName("PkmnMoves") as Phaser.GameObjects.Container).setVisible(partyVisible);
(c.getByName("PkmnInfoText") as Phaser.GameObjects.Container).setVisible(partyVisible);
(c.getByName("PkmnStatsText") as Phaser.GameObjects.Container).setVisible(partyVisible);
@ -623,9 +624,7 @@ export default class GameInfoUiHandler extends UiHandler {
this.runResultContainer.removeAll(true);
this.partyContainer.removeAll(true);
this.gameStatsContainer.removeAll(true);
if (this.victory) {
this.hallofFameContainer.removeAll(true);
}
this.hallofFameContainer.removeAll(true);
super.clear();
this.gameStatsContainer.setVisible(false);
ui.revertMode();