ShuriZma
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Frutescens 2024-08-02 11:26:27 -07:00
parent 7e35fca0f9 1f66aa48c3
commit 0bf15aff94
13 changed files with 125 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/images/ui/hall_of_fame.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

6
src/locales/de/run-history-ui-handler.ts
View File

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

10
src/locales/fr/menu-ui-handler.ts
View File

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

54
src/locales/fr/run-history-ui-handler.ts
View File

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

2
src/locales/it/menu-ui-handler.ts
View File

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

54
src/locales/it/run-history-ui-handler.ts
View File

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

2
src/locales/ko/menu-ui-handler.ts
View File

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

2
src/locales/pt_BR/menu-ui-handler.ts
View File

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

56
src/locales/pt_BR/run-history-ui-handler.ts
View File

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

2
src/locales/zh_CN/menu-ui-handler.ts
View File

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

56
src/locales/zh_CN/run-history-ui-handler.ts
View File

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

4
src/ui/run-history-ui-handler.ts
View File

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

5
src/ui/run-info-ui-handler.ts
View File

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