mirror of https://github.com/hykilpikonna/AquaDX
refactor: fix merge conflicts #1
Raymond
parent
dbe3f3393c
commit
f6efd392b9
|
|
@ -0,0 +1,161 @@
|
|||
<script lang="ts">
|
||||
import { fade } from "svelte/transition";
|
||||
import { CHU3_MATCHINGS } from "../../libs/config.js";
|
||||
import type { ChusanMatchingOption, GameOption } from "../../libs/generalTypes.js";
|
||||
import { t } from "../../libs/i18n.js";
|
||||
import { SETTING } from "../../libs/sdk.js";
|
||||
import StatusOverlays from "../StatusOverlays.svelte";
|
||||
import GameSettingFields from "./GameSettingFields.svelte";
|
||||
|
||||
let custom = false
|
||||
let overlay = false
|
||||
let loading = false
|
||||
let error = ""
|
||||
|
||||
let existingUrl = ""
|
||||
SETTING.get().then(s => {
|
||||
existingUrl = s.filter(it => it.key === 'chusanMatchingServer')[0]?.value
|
||||
|
||||
if (existingUrl && !CHU3_MATCHINGS.some(it => it.matching === existingUrl)) {
|
||||
custom = true
|
||||
}
|
||||
})
|
||||
|
||||
// Click on "Custom" option"
|
||||
function clickCustom() {
|
||||
custom = true
|
||||
overlay = false
|
||||
}
|
||||
|
||||
// Click on a matching option, set the reflector and matching server
|
||||
function clickOption(opt: ChusanMatchingOption) {
|
||||
Promise.all([
|
||||
SETTING.set('chusanMatchingReflector', opt.reflector),
|
||||
SETTING.set('chusanMatchingServer', opt.matching),
|
||||
]).then(() => {
|
||||
overlay = false
|
||||
custom = false
|
||||
existingUrl = opt.matching
|
||||
}).catch(e => error = e.message)
|
||||
}
|
||||
</script>
|
||||
|
||||
<StatusOverlays {error} {loading}/>
|
||||
|
||||
<div class="matching">
|
||||
<h2>{t("userbox.header.matching")}</h2>
|
||||
<p class="notice">{t("settings.cabNotice")}</p>
|
||||
|
||||
<div class="matching-selector">
|
||||
<button on:click={_ => overlay = true}>{t('userbox.matching.select')}</button>
|
||||
</div>
|
||||
|
||||
{#if custom}
|
||||
<GameSettingFields game="chu3-matching"/>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
{#if overlay}
|
||||
<div class="overlay" transition:fade>
|
||||
<div>
|
||||
<div>
|
||||
<h2>{t('userbox.header.matching')}</h2>
|
||||
<p>{t('userbox.matching.select.sub')}</p>
|
||||
</div>
|
||||
<div class="options">
|
||||
<!-- Selectable options -->
|
||||
{#each CHU3_MATCHINGS as option}
|
||||
<div class="clickable option" on:click={() => clickOption(option)}
|
||||
role="button" tabindex="0" on:keypress={e => e.key === 'Enter' && clickOption(option)}
|
||||
class:selected={!custom && existingUrl === option.matching}>
|
||||
|
||||
<span class="name">{option.name}</span>
|
||||
<div class="links">
|
||||
<a href={option.ui} target="_blank" rel="noopener">{t('userbox.matching.option.ui')}</a> /
|
||||
<a href={option.guide} target="_blank" rel="noopener">{t('userbox.matching.option.guide')}</a>
|
||||
</div>
|
||||
|
||||
<div class="divider"></div>
|
||||
|
||||
<div class="coop">
|
||||
<span>{t('userbox.matching.option.collab')}</span>
|
||||
<div>
|
||||
{#each option.coop as coop}
|
||||
<span>{coop}</span>
|
||||
{/each}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{/each}
|
||||
|
||||
<!-- Placeholder option for "Custom" -->
|
||||
<div class="clickable option" on:click={clickCustom}
|
||||
role="button" tabindex="0" on:keypress={e => e.key === 'Enter' && clickCustom()}
|
||||
class:selected={custom}>
|
||||
|
||||
<span class="name">{t('userbox.matching.custom.name')}</span>
|
||||
<p class="notice custom">{t('userbox.matching.custom.sub')}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<style lang="sass">
|
||||
@use "../../vars"
|
||||
|
||||
.matching
|
||||
display: flex
|
||||
flex-direction: column
|
||||
gap: 12px
|
||||
|
||||
h2
|
||||
margin-bottom: 0
|
||||
|
||||
p.notice
|
||||
opacity: 0.6
|
||||
margin: 0
|
||||
|
||||
&.custom
|
||||
font-size: 0.9rem
|
||||
|
||||
.options
|
||||
display: flex
|
||||
flex-wrap: wrap
|
||||
gap: 1rem
|
||||
|
||||
.option
|
||||
flex: 1
|
||||
display: flex
|
||||
flex-direction: column
|
||||
align-items: center
|
||||
|
||||
border-radius: vars.$border-radius
|
||||
background: vars.$ov-light
|
||||
padding: 1rem
|
||||
min-width: 150px
|
||||
|
||||
&.selected
|
||||
border: 1px solid vars.$c-main
|
||||
|
||||
.divider
|
||||
width: 100%
|
||||
height: 0.5px
|
||||
background: white
|
||||
opacity: 0.2
|
||||
margin: 0.8rem 0
|
||||
|
||||
.name
|
||||
font-size: 1.1rem
|
||||
font-weight: bold
|
||||
|
||||
.coop
|
||||
text-align: center
|
||||
|
||||
div
|
||||
display: flex
|
||||
flex-direction: column
|
||||
font-size: 0.9rem
|
||||
opacity: 0.6
|
||||
|
||||
</style>
|
||||
|
|
@ -23,6 +23,7 @@
|
|||
|
||||
import useLocalStorage from "../../libs/hooks/useLocalStorage.svelte";
|
||||
import { DDS } from "../../libs/userbox/dds";
|
||||
import ChuniMatchingSettings from "./ChuniMatchingSettings.svelte";
|
||||
|
||||
let user: AquaNetUser
|
||||
let [loading, error, submitting, preview] = [true, "", "", ""]
|
||||
|
|
@ -255,6 +256,7 @@
|
|||
<button on:click={() => USERBOX_SETUP_RUN = !USERBOX_SETUP_RUN}>{t(!USERBOX_INSTALLED ? `userbox.new.activate_first` : `userbox.new.activate_update`)}</button>
|
||||
</p>
|
||||
{/if}
|
||||
<ChuniMatchingSettings/>
|
||||
<!--{#if !USERBOX_SUPPORT || !USERBOX_INSTALLED || !USERBOX_ENABLED.value}
|
||||
<h2>{t("userbox.header.preview")}</h2>
|
||||
<p class="notice">{t("userbox.preview.notice")}</p>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
import type { ChusanMatchingOption } from "./generalTypes"
|
||||
|
||||
export const AQUA_HOST = 'https://aquadx.net/aqua'
|
||||
export const DATA_HOST = 'https://aquadx.net'
|
||||
|
|
@ -17,4 +18,28 @@ export const DEFAULT_PFP = '/assets/imgs/no_profile.png'
|
|||
|
||||
// USERBOX_ASSETS
|
||||
// Please note that if this is set, it must be manually unset by users in Chuni Settings -> Update Userbox -> Switch to URL mode -> (empty value) -> Enter key
|
||||
export const USERBOX_DEFAULT_URL = ""
|
||||
export const USERBOX_DEFAULT_URL = ""
|
||||
|
||||
export const HAS_USERBOX_ASSETS = true
|
||||
|
||||
// Meow meow meow
|
||||
|
||||
// Matching servers
|
||||
export const CHU3_MATCHINGS: ChusanMatchingOption[] = [
|
||||
{
|
||||
name: "林国对战",
|
||||
ui: "https://chu3-match.sega.ink/rooms",
|
||||
guide: "https://performai.evilleaker.com/manual/games/chunithm/national_battle/",
|
||||
matching: "https://chu3-match.sega.ink/",
|
||||
reflector: "http://reflector.naominet.live:18080/",
|
||||
coop: ["RinNET", "MysteriaNET"],
|
||||
},
|
||||
{
|
||||
name: "Yukiotoko",
|
||||
ui: "https://yukiotoko.metatable.sh/",
|
||||
guide: "https://github.com/MewoLab/AquaDX/blob/v1-dev/docs/chu3-national-matching.md",
|
||||
matching: "http://yukiotoko.chara.lol:9004/",
|
||||
reflector: "http://yukiotoko.chara.lol:50201/",
|
||||
coop: ["Missless", "CozyNet", "GMG"]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -153,3 +153,12 @@ export interface UserBox {
|
|||
level: number
|
||||
playerRating: number
|
||||
}
|
||||
|
||||
export interface ChusanMatchingOption {
|
||||
name: string
|
||||
ui: string
|
||||
guide: string
|
||||
matching: string
|
||||
reflector: string
|
||||
coop: string[]
|
||||
}
|
||||
|
|
@ -138,10 +138,14 @@ export const EN_REF_SETTINGS = {
|
|||
'settings.fields.waccaInfiniteWp.desc': 'Set WP to 999999',
|
||||
'settings.fields.waccaAlwaysVip.name': 'Wacca: Always VIP',
|
||||
'settings.fields.waccaAlwaysVip.desc': 'Set VIP expiration date to 2077-01-01',
|
||||
'settings.fields.chusanTeamName.name': 'Chuni: Team Name',
|
||||
'settings.fields.chusanTeamName.name': 'Team Name',
|
||||
'settings.fields.chusanTeamName.desc': 'Customize the text displayed on the top of your profile.',
|
||||
'settings.fields.chusanInfinitePenguins.name': 'Chuni: Infinite Penguins',
|
||||
'settings.fields.chusanInfinitePenguins.name': 'Infinite Penguins',
|
||||
'settings.fields.chusanInfinitePenguins.desc': 'Set penguin statues for character level prompting to 999.',
|
||||
'settings.fields.chusanMatchingReflector.name': 'Matching Server Reflector',
|
||||
'settings.fields.chusanMatchingReflector.desc': 'URL of the national matching server\'s UDP reflector.',
|
||||
'settings.fields.chusanMatchingServer.name': 'Matching Server',
|
||||
'settings.fields.chusanMatchingServer.desc': 'URL of the national matching server.',
|
||||
'settings.fields.rounding.name': 'Score Rounding',
|
||||
'settings.fields.rounding.desc': 'Round the score to one decimal place',
|
||||
'settings.fields.optOutOfLeaderboard.name': 'Opt Out of Leaderboard',
|
||||
|
|
@ -158,10 +162,12 @@ export const EN_REF_SETTINGS = {
|
|||
'settings.profile.unset': 'Unset',
|
||||
'settings.profile.unchanged': 'Unchanged',
|
||||
'settings.export': 'Export Player Data',
|
||||
'settings.cabNotice': "Note: These settings will only affect your own cab/setup. If you're playing on someone else's setup, please contact them to change these settings."
|
||||
}
|
||||
|
||||
export const EN_REF_USERBOX = {
|
||||
'userbox.header.general': 'General Settings',
|
||||
'userbox.header.matching': 'National Matching',
|
||||
'userbox.header.userbox': 'UserBox Settings',
|
||||
'userbox.header.preview': 'UserBox Preview',
|
||||
'userbox.nameplateId': 'Nameplate',
|
||||
|
|
|
|||
Loading…
Reference in New Issue