From b1eb36c3bf6969ffadbafbf975ea032eba73785a Mon Sep 17 00:00:00 2001 From: Opaque02 <66582645+Opaque02@users.noreply.github.com> Date: Mon, 14 Oct 2024 08:29:15 +1000 Subject: [PATCH] Fixed some minor bugs, made the save related errors have error codes, and added updated icons --- public/images/ui/legacy/link_icon.png | Bin 0 -> 209 bytes public/images/ui/legacy/unlink_icon.png | Bin 0 -> 219 bytes public/images/ui/link_icon.png | Bin 460 -> 209 bytes public/images/ui/unlink_icon.png | Bin 556 -> 219 bytes src/ui/admin-ui-handler.ts | 2 +- src/ui/login-form-ui-handler.ts | 24 ++++++++++++------------ src/ui/test-dialogue-ui-handler.ts | 4 ++++ 7 files changed, 17 insertions(+), 13 deletions(-) create mode 100644 public/images/ui/legacy/link_icon.png create mode 100644 public/images/ui/legacy/unlink_icon.png diff --git a/public/images/ui/legacy/link_icon.png b/public/images/ui/legacy/link_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..56081261b9c699571cd9faf1e242b708031a2188 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~(Ey(iS0F7S zBBGF@8~)z!6O!-hwX9tpn8k_Jk!mjw9*GyDgGrS;2x1BJppT^vIsrl$4>@*Pm% zaninU@BfKwmd1~MJyrHlcqDW3Lvre_D{FF2N-+OwVOYVqdCPK>IBtJ6t?$y}>T-NB yd;YT(r&d;#F$)^F-d(vS#eCYwSud6APOEbkF@Ah05PJ(~1%s!npUXO@geCwUuu3cd literal 0 HcmV?d00001 diff --git a/public/images/ui/legacy/unlink_icon.png b/public/images/ui/legacy/unlink_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f0da5f8e3eda4fdf27c6e07b11fffa17af715976 GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~p#Yx{S0JsU zsp;?U-__N%VZ(+;j~-2EH(3D`Wh)8t3ugEa0#%g{{sBc&JzX3_B&O!}ALKn?z`@LW zk*)tNn$K+b3IboFyt I=akR{02#wdng9R* literal 0 HcmV?d00001 diff --git a/public/images/ui/link_icon.png b/public/images/ui/link_icon.png index db5128140dc0d01503ea3fc925f5221cee0aa1a6..56081261b9c699571cd9faf1e242b708031a2188 100644 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~(Ey(iS0F7S zBBGF@8~)z!6O!-hwX9tpn8k_Jk!mjw9*GyDgGrS;2x1BJppT^vIsrl$4>@*Pm% zaninU@BfKwmd1~MJyrHlcqDW3Lvre_D{FF2N-+OwVOYVqdCPK>IBtJ6t?$y}>T-NB yd;YT(r&d;#F$)^F-d(vS#eCYwSud6APOEbkF@Ah05PJ(~1%s!npUXO@geCwUuu3cd literal 460 zcmV;-0WO0a~B}K7sT}=0h1! z1NV`q0d~*AHyvOMuAkr{Hv9tQz!F#>Co8R!c(-e9!OuYA$a}Gh?0pM-d%$~TD!1}2 zutl8mYr#_>wsIG$KE18Z`xsfG8>ST_hTA)-zJGUQ z&9x#-t0joLuDJKasY(^dCh}}69()Vz)kh_A<<7weKA%#GIft_Qc!A6$$6SA>73Z|W zbj;NMHW;ppO#N?b0@^aB6q!kdxT`_-q`k*)tNn$K+b3IboFyt I=akR{02#wdng9R* literal 556 zcmV+{0@MA8P)XQ)fHluB3O%xl>|u5D0#RRKuWVf-KVFMI6Ot9^M z75Ij;^BLls{RMRmF0?qD_{9Wz&5g-yuqy|fhaOjl`9UeaTd3(D#=3DRUUl5 u!GA6+;&>KOQ+s{K`h!4q diff --git a/src/ui/admin-ui-handler.ts b/src/ui/admin-ui-handler.ts index 327b1285efe..d6ad493d2af 100644 --- a/src/ui/admin-ui-handler.ts +++ b/src/ui/admin-ui-handler.ts @@ -168,7 +168,7 @@ export default class AdminUiHandler extends FormModalUiHandler { const img = this.scene.add.image(this.inputContainers[i].x + nineSlice.width + this.buttonGap, this.inputContainers[i].y + (Math.floor(nineSlice.height / 2)), adminResult[aR] === "" ? "link_icon" : "unlink_icon"); img.setName(`adminBtn_${aR}`); img.setOrigin(0.5, 0.5); - img.setScale(0.5); + //img.setScale(0.5); img.setInteractive(); img.on("pointerdown", () => { const service = aR.toLowerCase().replace("id", ""); // this takes our key (discordId or googleId) and removes the "Id" at the end to make it more url friendly diff --git a/src/ui/login-form-ui-handler.ts b/src/ui/login-form-ui-handler.ts index 631b2e50b02..4bc4be1cb9e 100644 --- a/src/ui/login-form-ui-handler.ts +++ b/src/ui/login-form-ui-handler.ts @@ -17,9 +17,9 @@ interface BuildInteractableImageOpts { export default class LoginFormUiHandler extends FormModalUiHandler { private readonly ERR_USERNAME: string = "invalid username"; - private readonly ERR_PASSWORD: string = "invalid password"; - private readonly ERR_ACCOUNT_EXIST: string = "account doesn't exist"; - private readonly ERR_PASSWORD_MATCH: string = "password doesn't match"; + private readonly ERR_PASSWORD: string = "invalid password"; + private readonly ERR_ACCOUNT_EXIST: string = "account doesn't exist"; + private readonly ERR_PASSWORD_MATCH: string = "password doesn't match"; private readonly ERR_NO_SAVES: string = "No save files found"; private readonly ERR_TOO_MANY_SAVES: string = "Too many save files found"; @@ -76,7 +76,7 @@ export default class LoginFormUiHandler extends FormModalUiHandler { } override getFields(_config?: ModalConfig): string[] { - return [ i18next.t("menu:username"), i18next.t("menu:password") ]; + return [i18next.t("menu:username"), i18next.t("menu:password")]; } override getWidth(_config?: ModalConfig): number { @@ -84,11 +84,11 @@ export default class LoginFormUiHandler extends FormModalUiHandler { } override getMargin(_config?: ModalConfig): [number, number, number, number] { - return [ 0, 0, 48, 0 ]; + return [0, 0, 48, 0]; } override getButtonLabels(_config?: ModalConfig): string[] { - return [ i18next.t("menu:login"), i18next.t("menu:register")]; + return [i18next.t("menu:login"), i18next.t("menu:register")]; } override getReadableErrorMessage(error: string): string { @@ -106,9 +106,9 @@ export default class LoginFormUiHandler extends FormModalUiHandler { case this.ERR_PASSWORD_MATCH: return i18next.t("menu:unmatchingPassword"); case this.ERR_NO_SAVES: - return i18next.t("menu:noSaves"); + return "P01: " + i18next.t("menu:noSaves"); case this.ERR_TOO_MANY_SAVES: - return i18next.t("menu:tooManySaves"); + return "P02: " + i18next.t("menu:tooManySaves"); } return super.getReadableErrorMessage(error); @@ -164,16 +164,16 @@ export default class LoginFormUiHandler extends FormModalUiHandler { [this.discordImage, this.googleImage, this.usernameInfoImage].forEach((img) => img.off("pointerdown")); } - private processExternalProvider(config: ModalConfig) : void { + private processExternalProvider(config: ModalConfig): void { this.externalPartyTitle.setText(i18next.t("menu:orUse") ?? ""); - this.externalPartyTitle.setX(20+this.externalPartyTitle.text.length); + this.externalPartyTitle.setX(20 + this.externalPartyTitle.text.length); this.externalPartyTitle.setVisible(true); this.externalPartyContainer.setPositionRelative(this.modalContainer, 175, 0); this.externalPartyContainer.setVisible(true); this.externalPartyBg.setSize(this.externalPartyTitle.text.length + 50, this.modalBg.height); this.getUi().moveTo(this.externalPartyContainer, this.getUi().length - 1); - this.googleImage.setPosition(this.externalPartyBg.width/3.1, this.externalPartyBg.height-60); - this.discordImage.setPosition(this.externalPartyBg.width/3.1, this.externalPartyBg.height-40); + this.googleImage.setPosition(this.externalPartyBg.width / 3.1, this.externalPartyBg.height - 60); + this.discordImage.setPosition(this.externalPartyBg.width / 3.1, this.externalPartyBg.height - 40); this.infoContainer.setPosition(5, -76); this.infoContainer.setVisible(true); diff --git a/src/ui/test-dialogue-ui-handler.ts b/src/ui/test-dialogue-ui-handler.ts index 0acd9da193b..90970899351 100644 --- a/src/ui/test-dialogue-ui-handler.ts +++ b/src/ui/test-dialogue-ui-handler.ts @@ -70,6 +70,10 @@ export default class TestDialogueUiHandler extends FormModalUiHandler { show(args: any[]): boolean { const ui = this.getUi(); + const fields = this.getFields(); + const hasTitle = !!this.getModalTitle(); + this.updateFields(fields, hasTitle); + this.updateContainer(args[0] as ModalConfig); const input = this.inputs[0]; input.setMaxLength(255);