mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-30 20:22:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: mika:80fcba22cf4ac70ec1820a14ecb72f5178744c09
Branches Tags
mika:main
mika:gh-pages
mika:beta
mika:Bertie690-patch-1
mika:damo-MysteryEncounterCollection
mika:workflow-dispatch
mika:modifier-rework
mika:typedoc
mika:2024-12-3-balanced-friendship
mika:2024-11-17-carpe-diem
mika:2024-10-26-halloween
mika:2024-09-07-egg-summary
mika:2024-09-27-mystery-encounter
mika:2024-08-16-august-variant-update
mika:2024-09-01-run-history
mika:beginning
..
compare: mika:5b4dc8a7d0d1206c6d4a402b001334e9e79d3052
Branches Tags
mika:gh-pages
mika:beta
mika:Bertie690-patch-1
mika:damo-MysteryEncounterCollection
mika:workflow-dispatch
mika:modifier-rework
mika:typedoc
mika:main
mika:2024-12-3-balanced-friendship
mika:2024-11-17-carpe-diem
mika:2024-10-26-halloween
mika:2024-09-07-egg-summary
mika:2024-09-27-mystery-encounter
mika:2024-08-16-august-variant-update
mika:2024-09-01-run-history
mika:beginning

No commits in common. "80fcba22cf4ac70ec1820a14ecb72f5178744c09" and "5b4dc8a7d0d1206c6d4a402b001334e9e79d3052" have entirely different histories.
80fcba22cf ... 5b4dc8a7d0

1 changed files with 26 additions and 30 deletions
Show Stats Expand all files Collapse all files

56
src/ui/menu-ui-handler.ts
View File

@ -40,7 +40,7 @@ export default class MenuUiHandler extends MessageUiHandler {
private cursorObj: Phaser.GameObjects.Image; private cursorObj: Phaser.GameObjects.Image;
private excludedMenus: () => ConditionalMenu[]; private excludedMenus: () => { condition: boolean, options: MenuOptions[] }[];
private menuOptions: MenuOptions[]; private menuOptions: MenuOptions[];
protected manageDataConfig: OptionSelectConfig; protected manageDataConfig: OptionSelectConfig;
@ -64,8 +64,23 @@ export default class MenuUiHandler extends MessageUiHandler {
}); });
} }
setup(): void { setup() {
this.render();
}
render() {
const ui = this.getUi(); const ui = this.getUi();
this.excludedMenus = () => [
{ condition: ![Mode.COMMAND, Mode.TITLE].includes(ui.getModeChain()[0]), options: [ MenuOptions.EGG_GACHA, MenuOptions.EGG_LIST] },
{ condition: bypassLogin, options: [ MenuOptions.LOG_OUT ] }
];
this.menuOptions = Utils.getEnumKeys(MenuOptions)
.map(m => parseInt(MenuOptions[m]) as MenuOptions)
.filter(m => {
return !this.excludedMenus().some(exclusion => exclusion.condition && exclusion.options.includes(m));
});
// wiki url directs based on languges available on wiki // wiki url directs based on languges available on wiki
const lang = i18next.resolvedLanguage.substring(0,2); const lang = i18next.resolvedLanguage.substring(0,2);
if (["de", "fr", "ko", "zh"].includes(lang)) { if (["de", "fr", "ko", "zh"].includes(lang)) {
@ -86,25 +101,10 @@ export default class MenuUiHandler extends MessageUiHandler {
this.menuOverlay.setOrigin(0,0); this.menuOverlay.setOrigin(0,0);
this.menuContainer.add(this.menuOverlay); this.menuContainer.add(this.menuOverlay);
this.menuContainer.add(this.bgmBar); const menuMessageText = addTextObject(this.scene, 8, 8, "", TextStyle.WINDOW, { maxLines: 2 });
menuMessageText.setName("menu-message");
this.menuContainer.setVisible(false); menuMessageText.setWordWrapWidth(1224);
menuMessageText.setOrigin(0, 0);
}
render() {
const ui = this.getUi();
this.excludedMenus = () => [
{ condition: ![Mode.COMMAND, Mode.TITLE].includes(ui.getModeChain()[0]), options: [ MenuOptions.EGG_GACHA, MenuOptions.EGG_LIST] },
{ condition: bypassLogin, options: [ MenuOptions.LOG_OUT ] }
];
this.menuOptions = Utils.getEnumKeys(MenuOptions)
.map(m => parseInt(MenuOptions[m]) as MenuOptions)
.filter(m => {
return !this.excludedMenus().some(exclusion => exclusion.condition && exclusion.options.includes(m));
});
this.optionSelectText = addTextObject(this.scene, 0, 0, this.menuOptions.map(o => `${i18next.t(`menuUiHandler:${MenuOptions[o]}`)}`).join("\n"), TextStyle.WINDOW, { maxLines: this.menuOptions.length }); this.optionSelectText = addTextObject(this.scene, 0, 0, this.menuOptions.map(o => `${i18next.t(`menuUiHandler:${MenuOptions[o]}`)}`).join("\n"), TextStyle.WINDOW, { maxLines: this.menuOptions.length });
this.optionSelectText.setLineSpacing(12); this.optionSelectText.setLineSpacing(12);
@ -129,12 +129,10 @@ export default class MenuUiHandler extends MessageUiHandler {
menuMessageBox.setOrigin(0, 0); menuMessageBox.setOrigin(0, 0);
this.menuMessageBoxContainer.add(menuMessageBox); this.menuMessageBoxContainer.add(menuMessageBox);
const menuMessageText = addTextObject(this.scene, 8, 8, "", TextStyle.WINDOW, { maxLines: 2 });
menuMessageText.setName("menu-message");
menuMessageText.setWordWrapWidth(1224);
menuMessageText.setOrigin(0, 0);
this.menuMessageBoxContainer.add(menuMessageText); this.menuMessageBoxContainer.add(menuMessageText);
this.menuContainer.add(this.bgmBar);
this.message = menuMessageText; this.message = menuMessageText;
this.menuContainer.add(this.menuMessageBoxContainer); this.menuContainer.add(this.menuMessageBoxContainer);
@ -293,7 +291,10 @@ export default class MenuUiHandler extends MessageUiHandler {
xOffset: 98, xOffset: 98,
options: communityOptions options: communityOptions
}; };
this.setCursor(0); this.setCursor(0);
this.menuContainer.setVisible(false);
} }
show(args: any[]): boolean { show(args: any[]): boolean {
@ -532,8 +533,3 @@ export default class MenuUiHandler extends MessageUiHandler {
this.cursorObj = null; this.cursorObj = null;
} }
} }
interface ConditionalMenu {
condition: boolean;
options: MenuOptions[];
}