Merge branch 'v1-dev' into broker

AquaNet/src/libs/config.ts

@@ -1,15 +1,15 @@
 import type { ChusanMatchingOption } from "./generalTypes"
 
-export const AQUA_HOST = 'https://aquadx.net/aqua'
-export const DATA_HOST = 'https://aquadx.net'
+export const AQUA_HOST = import.meta.env.VITE_AQUA_HOST
+export const DATA_HOST = import.meta.env.VITE_DATA_HOST
 
 // This will be displayed for users to connect from the client
-export const AQUA_CONNECTION = 'aquadx.hydev.org'
+export const AQUA_CONNECTION = import.meta.env.VITE_AQUA_CONNECTION
 
-export const TURNSTILE_SITE_KEY = '0x4AAAAAAASGA2KQEIelo9P9'
-export const DISCORD_INVITE = 'https://discord.gg/FNgveqFF7s'
-export const TELEGRAM_INVITE = 'https://t.me/+zBL4RZdyfvUzZGU1'
-export const QQ_INVITE = 'https://qm.qq.com/q/wvNXbXbHbO'
+export const TURNSTILE_SITE_KEY = import.meta.env.VITE_TURNSTILE_SITE_KEY
+export const DISCORD_INVITE = import.meta.env.VITE_DISCORD_INVITE
+export const TELEGRAM_INVITE = import.meta.env.VITE_TELEGRAM_INVITE
+export const QQ_INVITE = import.meta.env.VITE_QQ_INVITE
 
 // UI
 export const FADE_OUT = { duration: 200 }

AquaNet/src/libs/generalTypes.ts

@@ -142,6 +142,8 @@ export interface UserBox {
   frameId: number,
   characterId: number,
   trophyId: number,
+  trophyIdSub1: number,
+  trophyIdSub2: number,
   mapIconId: number,
   voiceId: number,
   avatarWear: number,

AquaNet/src/libs/i18n/en_ref.ts

@@ -191,6 +191,8 @@ export const EN_REF_USERBOX = {
   'userbox.nameplateId': 'Nameplate',
   'userbox.frameId': 'Frame',
   'userbox.trophyId': 'Trophy (Title)',
+  'userbox.trophyIdSub1': 'Trophy Sub #1 (Title)',
+  'userbox.trophyIdSub2': 'Trophy Sub #2 (Title)',
   'userbox.mapIconId': 'Map Icon',
   'userbox.voiceId': 'System Voice',
   'userbox.avatarWear': 'Avatar Wear',