diff --git a/package-lock.json b/package-lock.json index 5017606..2372a4f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "d3": "^7.9.0", "fs": "^0.0.1-security", "marked": "^14.1.4", - "moons-ta-client": "^1.1.13", + "moons-ta-client": "^1.1.14", "prismjs": "^1.30.0", "uuid": "^11.1.0" }, @@ -3179,9 +3179,9 @@ } }, "node_modules/moons-ta-client": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/moons-ta-client/-/moons-ta-client-1.1.13.tgz", - "integrity": "sha512-aoCb5bEZOVpRWl0FDam62ZDojCiGBr9GfGbwPMjJmiY0C6dOpkXT4HGSlFRbYjS5KAjuUy6FCLBMxovuLLS6Zw==", + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/moons-ta-client/-/moons-ta-client-1.1.14.tgz", + "integrity": "sha512-vHN0/j9qMj8GVgXaxkA/BXsCK5BybpqZ1xtl3Sz2a5zzjIOOUzKuXMRy4+/kpFnSn6R8QgkMmmNU+EorPRH9Eg==", "dependencies": { "@protobuf-ts/plugin": "^2.6.0", "events": "^3.3.0", diff --git a/package.json b/package.json index a490094..30db63e 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "d3": "^7.9.0", "fs": "^0.0.1-security", "marked": "^14.1.4", - "moons-ta-client": "^1.1.13", + "moons-ta-client": "^1.1.14", "prismjs": "^1.30.0", "uuid": "^11.1.0" }, diff --git a/src/lib/components/popups/EditMap.svelte b/src/lib/components/popups/EditMap.svelte index 1142ca8..2d2833c 100644 --- a/src/lib/components/popups/EditMap.svelte +++ b/src/lib/components/popups/EditMap.svelte @@ -1,21 +1,20 @@
-

{map ? 'Edit Map' : 'Add New Map'}

+
+

{map ? 'Edit' : 'Add'} {getModeDisplayText()}

+
+ {mode === 'qualifier' ? 'Qualifier' : 'Tournament'} +
+
@@ -407,7 +639,7 @@ type="button" class="lookup-button" on:click={() => fetchMapFromBeatSaver(beatSaverKey)} - disabled={!beatSaverKey || isLoadingMap} + disabled={!beatSaverKey.trim() || isLoadingMap} > {#if isLoadingMap} sync @@ -485,9 +717,9 @@

Game Modifiers

-

Select which modifiers are enabled for this map

+

Select which modifiers are enabled for this {mode} map

- {#each Object.entries(getGroupedModifiers()) as [group, modifiers]} + {#each Object.entries(groupedModifiers) as [group, modifiers]}
{group}
@@ -496,11 +728,11 @@
@@ -510,51 +742,118 @@ {/each}
-
-

TournamentAssistant Features

-

Set some of the TA settings for the map

+ +
+

Tournament Assistant Settings

+

Configure game behavior options

-
- -
- - {#if limitAttemptsEnabled} -
- - +
+
+
- {/if} + +
+ +
+ + {#if mode === 'playing'} +
+ +
+ +
+ +
+ +
+ +
+ {/if} + + {#if mode === 'qualifier'} +
+ +

Restrict the number of attempts allowed for this qualifier

+
+ + {#if limitAttemptsEnabled} +
+ + +

Maximum number of attempts allowed (1-10000)

+
+ {/if} + {/if} +
- +
@@ -1086,4 +1385,346 @@ height: 120px; } } + .header-content { + display: flex; + align-items: center; + gap: 1rem; + } + + .header-content h3 { + margin: 0; + font-size: 1.25rem; + font-weight: 600; + } + + .mode-indicator { + display: flex; + align-items: center; + gap: 0.5rem; + padding: 0.375rem 0.75rem; + border-radius: 1rem; + font-size: 0.8125rem; + font-weight: 500; + text-transform: uppercase; + letter-spacing: 0.025em; + } + + .mode-indicator.mode-qualifier { + background-color: rgba(255, 193, 7, 0.15); + color: #ffc107; + border: 1px solid rgba(255, 193, 7, 0.3); + } + + .mode-indicator.mode-playing { + background-color: rgba(40, 167, 69, 0.15); + color: #28a745; + border: 1px solid rgba(40, 167, 69, 0.3); + } + + .mode-icon { + font-size: 1rem; + line-height: 1; + } + + .mode-text { + font-size: 0.75rem; + font-weight: 600; + } + + /* Qualifier-specific styling */ + .qualifier-features-section { + border-left: 3px solid #ffc107; + background-color: rgba(255, 193, 7, 0.05); + } + + .qualifier-options { + display: flex; + flex-direction: column; + gap: 1rem; + } + + .qualifier-toggle { + display: flex; + align-items: center; + } + + .attempts-input { + margin-left: 3.25rem; + margin-top: 0.75rem; + max-width: 200px; + } + + .attempts-input input { + padding: 0.5rem 0.75rem; + font-size: 0.875rem; + } + + /* Header content and mode indicator */ + .header-content { + display: flex; + align-items: center; + gap: 1rem; + } + + .header-content h3 { + margin: 0; + font-size: 1.25rem; + font-weight: 600; + } + + .mode-indicator { + display: flex; + align-items: center; + gap: 0.5rem; + padding: 0.375rem 0.75rem; + border-radius: 1rem; + font-size: 0.8125rem; + font-weight: 500; + text-transform: uppercase; + letter-spacing: 0.025em; + } + + .mode-indicator.mode-qualifier { + background-color: rgba(255, 193, 7, 0.15); + color: #ffc107; + border: 1px solid rgba(255, 193, 7, 0.3); + } + + .mode-indicator.mode-playing { + background-color: rgba(40, 167, 69, 0.15); + color: #28a745; + border: 1px solid rgba(40, 167, 69, 0.3); + } + + .mode-icon { + font-size: 1rem; + line-height: 1; + } + + .mode-text { + font-size: 0.75rem; + font-weight: 600; + } + + /* Modifier toggle improvements */ + .modifier-toggle { + background-color: var(--bg-primary); + border-radius: 0.375rem; + padding: 0.75rem; + border: 1px solid var(--bg-tertiary); + transition: all 0.2s ease; + } + + .modifier-toggle:hover { + background-color: var(--bg-tertiary); + border-color: var(--accent-color); + } + + .modifier-toggle .switch-label { + margin: 0; + width: 100%; + } + + .modifier-toggle .label-text { + font-weight: 500; + line-height: 1.2; + } + + /* Disabled state improvements */ + .switch.disabled { + opacity: 0.5; + background-color: var(--bg-tertiary); + } + + .switch.disabled:before { + background-color: #ccc; + } + + .modifier-toggle:has(.switch.disabled) { + opacity: 0.6; + cursor: not-allowed; + } + + .modifier-toggle:has(.switch.disabled):hover { + background-color: var(--bg-primary); + border-color: var(--bg-tertiary); + } + + /* Beatsaver lookup improvements */ + .beatsaver-lookup { + background-color: var(--bg-primary); + border-radius: 0.5rem; + padding: 1rem; + border: 1px solid var(--bg-tertiary); + } + + .beatsaver-lookup label { + font-weight: 600; + color: var(--text-primary); + } + + /* Enhanced responsive design */ + @media (max-width: 768px) { + .header-content { + flex-direction: column; + align-items: flex-start; + gap: 0.5rem; + } + + .mode-indicator { + align-self: flex-start; + } + + .attempts-input { + margin-left: 0; + max-width: 100%; + } + + .qualifier-options { + gap: 0.75rem; + } + } + + @media (max-width: 480px) { + .header-content h3 { + font-size: 1.125rem; + } + + .mode-indicator { + padding: 0.25rem 0.5rem; + font-size: 0.75rem; + } + + .mode-icon { + font-size: 0.875rem; + } + + .mode-text { + font-size: 0.6875rem; + } + + .modifier-toggle { + padding: 0.5rem; + } + + .modifier-toggle .label-text { + font-size: 0.8125rem; + } + } + + /* Focus and accessibility improvements */ + .switch-label:focus-within .switch { + box-shadow: 0 0 0 2px rgba(var(--accent-color-rgb), 0.2); + } + + .lookup-button:focus { + outline: 2px solid var(--accent-color); + outline-offset: 2px; + } + + .close-button:focus { + outline: 2px solid var(--accent-color); + outline-offset: 2px; + } + + /* Animation improvements */ + .popup-container { + animation: slideIn 0.2s ease-out; + } + + @keyframes slideIn { + from { + opacity: 0; + transform: translateY(-20px) scale(0.95); + } + to { + opacity: 1; + transform: translateY(0) scale(1); + } + } + + /* Loading state improvements */ + .loading-icon { + animation: spin 1s linear infinite; + } + + .beatsaver-lookup:has(.loading-icon) { + opacity: 0.8; + } + + /* Section dividers */ + .form-section:not(:last-child) { + border-bottom: 1px solid var(--bg-tertiary); + padding-bottom: 1.5rem; + margin-bottom: 1.5rem; + } + + .form-section:last-child { + margin-bottom: 0; + } + + /* Error state improvements */ + .error-message { + animation: fadeIn 0.3s ease-out; + } + + @keyframes fadeIn { + from { + opacity: 0; + transform: translateY(-10px); + } + to { + opacity: 1; + transform: translateY(0); + } + } + + /* Tooltip-like description on hover */ + .modifier-toggle:hover::after { + content: attr(title); + position: absolute; + bottom: 100%; + left: 50%; + transform: translateX(-50%); + background-color: var(--bg-primary); + color: var(--text-primary); + padding: 0.5rem; + border-radius: 0.25rem; + font-size: 0.75rem; + white-space: nowrap; + z-index: 1001; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2); + border: 1px solid var(--bg-tertiary); + pointer-events: none; + } + + /* Improved form validation states */ + .form-group:has(input:invalid) label { + color: #ff5555; + } + + .form-group:has(input:invalid) input { + border-color: #ff5555; + } + + .form-group:has(input:valid) input { + border-color: #28a745; + } + + /* Dark theme adjustments */ + @media (prefers-color-scheme: dark) { + .mode-indicator.mode-qualifier { + background-color: rgba(255, 193, 7, 0.2); + border-color: rgba(255, 193, 7, 0.4); + } + + .mode-indicator.mode-playing { + background-color: rgba(40, 167, 69, 0.2); + border-color: rgba(40, 167, 69, 0.4); + } + + .qualifier-features-section { + background-color: rgba(255, 193, 7, 0.08); + } + } \ No newline at end of file diff --git a/src/lib/services/beatsaver.ts b/src/lib/services/beatsaver.ts new file mode 100644 index 0000000..cf91c59 --- /dev/null +++ b/src/lib/services/beatsaver.ts @@ -0,0 +1,230 @@ +interface BeatSaverMap { + id: string; + name: string; + description: string; + uploader: { + id: number; + name: string; + hash: string; + avatar: string; + }; + metadata: { + bpm: number; + duration: number; + songName: string; + songSubName: string; + songAuthorName: string; + levelAuthorName: string; + }; + stats: { + plays: number; + downloads: number; + upvotes: number; + downvotes: number; + score: number; + }; + uploaded: string; + automapper: boolean; + ranked: boolean; + qualified: boolean; + versions: Array<{ + hash: string; + key: string; + state: string; + createdAt: string; + sageScore: number; + diffs: Array<{ + njs: number; + offset: number; + notes: number; + bombs: number; + obstacles: number; + nps: number; + length: number; + characteristic: string; + difficulty: string; + events: number; + chroma: boolean; + me: boolean; + ne: boolean; + cinema: boolean; + seconds: number; + paritySummary: { + errors: number; + warns: number; + resets: number; + }; + stars: number; + }>; + downloadURL: string; + previewURL: string; + }>; +} + +const BEATSAVER_API_BASE = 'https://api.beatsaver.com'; +const BATCH_SIZE = 50; + +/** + * Fetches multiple maps from BeatSaver by their hashes or keys + * Automatically batches requests into groups of 50 as per BeatSaver API limits + * Separates keys and hashes to use appropriate endpoints + */ +export async function fetchMapsByHashesOrKeys(identifiers: string[]): Promise { + if (identifiers.length === 0) { + return []; + } + + // Separate keys and hashes + const keys: string[] = []; + const hashes: string[] = []; + + for (const identifier of identifiers) { + if (isKey(identifier)) { + keys.push(identifier); + } else if (isHash(identifier)) { + hashes.push(identifier); + } else { + console.warn(`Skipping invalid identifier: ${identifier}`); + } + } + + const allMaps: BeatSaverMap[] = []; + + // Process keys in batches + if (keys.length > 0) { + const keyBatches: string[][] = []; + for (let i = 0; i < keys.length; i += BATCH_SIZE) { + keyBatches.push(keys.slice(i, i + BATCH_SIZE)); + } + + for (const batch of keyBatches) { + try { + const idsParam = batch.join(','); + const response = await fetch(`${BEATSAVER_API_BASE}/maps/ids/${idsParam}`); + + if (!response.ok) { + throw new Error(`BeatSaver API error for keys: ${response.status} ${response.statusText}`); + } + + const data = await response.json(); + const maps = Object.values(data) as BeatSaverMap[]; + allMaps.push(...maps); + } catch (error) { + console.error('Error fetching key batch:', error); + throw error; + } + } + } + + // Process hashes in batches + if (hashes.length > 0) { + const hashBatches: string[][] = []; + for (let i = 0; i < hashes.length; i += BATCH_SIZE) { + hashBatches.push(hashes.slice(i, i + BATCH_SIZE)); + } + + for (const batch of hashBatches) { + try { + const hashesParam = batch.join(','); + const response = await fetch(`${BEATSAVER_API_BASE}/maps/hashes/${hashesParam}`); + + if (!response.ok) { + throw new Error(`BeatSaver API error for hashes: ${response.status} ${response.statusText}`); + } + + const data = await response.json(); + const maps = Object.values(data) as BeatSaverMap[]; + allMaps.push(...maps); + } catch (error) { + console.error('Error fetching hash batch:', error); + throw error; + } + } + } + + return allMaps; +} + +/** + * Determines if an identifier is a BeatSaver key (numeric) or hash (hex string) + */ +function isKey(identifier: string): boolean { + return /^\d+$/.test(identifier); +} + +/** + * Determines if an identifier is a hash (40-character hex string) + */ +function isHash(identifier: string): boolean { + return /^[a-fA-F0-9]{40}$/.test(identifier); +} + +/** + * Fetches a single map by its hash or key + */ +export async function fetchMapByHashOrKey(identifier: string): Promise { + try { + let endpoint: string; + + if (isKey(identifier)) { + endpoint = `${BEATSAVER_API_BASE}/maps/id/${identifier}`; + } else if (isHash(identifier)) { + endpoint = `${BEATSAVER_API_BASE}/maps/hash/${identifier}`; + } else { + throw new Error(`Invalid identifier format. Expected either a numeric key or 40-character hex hash, got: ${identifier}`); + } + + const response = await fetch(endpoint); + + if (response.status === 404) { + return null; + } + + if (!response.ok) { + throw new Error(`BeatSaver API error: ${response.status} ${response.statusText}`); + } + + return await response.json() as BeatSaverMap; + } catch (error) { + console.error('Error fetching map:', error); + throw error; + } +} + +/** + * Extracts the hash from a Beat Saber level ID string (format: custom_level_levelhash) + */ +export function extractHashFromLevelId(levelId: string): string { + const prefix = 'custom_level_'; + if (!levelId.startsWith(prefix)) { + throw new Error(`Invalid level ID format. Expected format: ${prefix}[hash]`); + } + return levelId.substring(prefix.length); +} + +/** + * Fetches a map by Beat Saber level ID string (custom_level_levelhash format) + */ +export async function fetchMapByLevelId(levelId: string): Promise { + try { + const hash = extractHashFromLevelId(levelId); + return await fetchMapByHashOrKey(hash); + } catch (error) { + console.error('Error fetching map by level ID:', error); + throw error; + } +} + +/** + * Fetches multiple maps by Beat Saber level ID strings + * Automatically extracts hashes and batches requests + */ +export async function fetchMapsByLevelIds(levelIds: string[]): Promise { + try { + const hashes = levelIds.map(levelId => extractHashFromLevelId(levelId)); + return await fetchMapsByHashesOrKeys(hashes); + } catch (error) { + console.error('Error fetching maps by level IDs:', error); + throw error; + } +} \ No newline at end of file diff --git a/src/lib/taDocs/taInfo.md b/src/lib/taDocs/taInfo.md new file mode 100644 index 0000000..55c1fcb --- /dev/null +++ b/src/lib/taDocs/taInfo.md @@ -0,0 +1,24 @@ +# Further information about the TournamentAssistant Client + +- As stated many times previously, TournamentAssistant uses ProtoBuf. ProtoBuf is a data serialiser which allows TA to transport smaller packets. This is essential since all of the live scores are sent to all of the clients who subscribe to it etc. + +- The connection to the TA Core Server is a websocket connection. If you wish, you can opt not to use the provided client, however it is strongly advised against due to serialisation. + +- Beware that the coordinator(or the client in other words) connects to a different port on the server than the player playing, hence it is not possible to directly listen to packets from players. + +- TournamentAssistant does not *yet* support hosting your own Core Server in order to reduce complications for players and developers alike. + +## StateManager + +TournamentAssistant is a state-based application. This means that when you join a tournament you are not "fetching" the tournament info, rather you are pulling it from the state. It is often much more efficient to use taClient.stateManager rather then waiting for a response from the server. + +When you initiate the websocket connection, the initial state of the core server is passed on. This is sanitised data and the tournament which should be hidden will not be passed on here. Once this data is deserialised, it is stored and updated in the stateManager. + +You might also notice that the stateManager is the only way to fetch tournament info etc. This is again done to ease development and redice server load. + +
+ info +
+ Will the stateManager be out-of-date? The stateManager automatically updates its state when a packet is received or sent, so no, you do not have to worry about out-of-date information being stored. +
+
\ No newline at end of file diff --git a/src/routes/documentation/+page.svelte b/src/routes/documentation/+page.svelte index fdb5f4a..1316237 100644 --- a/src/routes/documentation/+page.svelte +++ b/src/routes/documentation/+page.svelte @@ -19,7 +19,8 @@ items: [ { title: "Introduction", file: "intro", order: 1 }, { title: "Installation", file: "sample", order: 2 }, - { title: "Client", file: "client", order: 3 } + { title: "Client", file: "client", order: 3 }, + { title: "How TA Works, Info", file: "taInfo", order: 4 } ] }, { diff --git a/src/routes/tournaments/[tournamentguid]/+page.svelte b/src/routes/tournaments/[tournamentguid]/+page.svelte index 0b63422..31a702d 100644 --- a/src/routes/tournaments/[tournamentguid]/+page.svelte +++ b/src/routes/tournaments/[tournamentguid]/+page.svelte @@ -6,6 +6,7 @@ import { Match, Tournament, TAClient, Response_ResponseType } from 'moons-ta-client'; import { writable } from "svelte/store"; import SideMenu from "$lib/components/menus/SideMenuTournaments.svelte"; + import { goto } from "$app/navigation"; export let data; @@ -16,6 +17,7 @@ let matches: Match[] = []; let availablePlayers: any[] = []; let selectedPlayers: any[] = []; + let isCreatingMatch: boolean = false; // Store for selected player guids const selectedPlayerGuids = writable([]); @@ -63,7 +65,7 @@ // Handle match status changes function handleMatchUpdated(params: any) { console.log("matchUpdate", params); - if (params.guid === tournamentGuid) { + if (params[1].guid === tournamentGuid) { // Update matches list fetchTournamentData(); } @@ -71,6 +73,16 @@ // Handle match deletion function handleMatchDeleted(matchInfo: any) { + console.log('matchDeleted', matchInfo) + if (matchInfo[1].guid === tournamentGuid) { + // Update matches list + fetchTournamentData(); + } + }; + + // Handle match deletion + function handleMatchCreated(matchInfo: any) { + console.log('matchCreated', matchInfo); if (matchInfo[1].guid === tournamentGuid) { // Update matches list fetchTournamentData(); @@ -94,7 +106,7 @@ throw new Error(connectResult.details.connect.message); } } - + tournament = client.stateManager.getTournament(tournamentGuid); if(!tournament?.users.some(user => user.guid == client.stateManager.getSelfGuid())) { const joinResult = await client.joinTournament(tournamentGuid); @@ -105,10 +117,6 @@ tournament = joinResult.details.join.state?.tournaments.find((x: Tournament) => x.guid === tournamentGuid); } - if(client.stateManager.getTournaments().some(tournament => tournament.users.some(user => user.guid == client.stateManager.getSelfGuid() && user.clientType == 1))) { - - } - // Wait for state to be fully initialized await new Promise(resolve => setTimeout(resolve, 1000)); @@ -132,14 +140,8 @@ availablePlayers = allUsers.filter(user => !matches.some(match => match.associatedUsers.includes(user.guid))); client.on('createdMatch', (params) => { - console.log("paramsUpdate", params) + console.log("paramsUpdate", params); }); - - client.on('updatedMatch', (params) => { - console.log("paramsUpdate", params) - }) - - client.on('deletedMatch', handleMatchDeleted); } catch (err) { console.error('Error fetching tournament data:', err); error = err instanceof Error ? err.message : 'An unknown error occurred'; @@ -158,11 +160,18 @@ }); console.log(response) + + const newMatch = (response as any).details.createMatch.match; + + goto(`/tournaments/${tournamentGuid}/matches/${newMatch.guid}`); } onMount(async() => { if ($authTokenStore) { await fetchTournamentData(); + client.stateManager.on('matchCreated', handleMatchCreated); + client.stateManager.on('matchDeleted', handleMatchDeleted); + client.stateManager.on('matchUpdated', handleMatchUpdated); } else { window.location.href = "/discordAuth" } @@ -171,6 +180,7 @@ onDestroy(() => { client.stateManager.removeListener('matchUpdated', handleMatchUpdated); client.stateManager.removeListener('matchDeleted', handleMatchDeleted); + client.stateManager.removeListener('matchCreated', handleMatchDeleted); client.removeListener('createdMatch', handleMatchUpdated) // client.disconnect(); }); @@ -242,7 +252,7 @@ {/if}
- + visibility View diff --git a/src/routes/tournaments/[tournamentguid]/mappools/[poolGuid]/+page.svelte b/src/routes/tournaments/[tournamentguid]/mappools/[poolGuid]/+page.svelte index 7552000..9c53b60 100644 --- a/src/routes/tournaments/[tournamentguid]/mappools/[poolGuid]/+page.svelte +++ b/src/routes/tournaments/[tournamentguid]/mappools/[poolGuid]/+page.svelte @@ -66,31 +66,32 @@ enabled: boolean; disabled?: boolean; group?: string; - incompatibilites?: GameplayModifiers_GameOptions[]; + incompatibilityGroup?: string; + allowedInMode: string[]; } - let gameModifiers: Modifier[] = [ - // Player modifiers - { id: GameplayModifiers_GameOptions.NoFail, name: "No Fail", description: "You can't fail the level", enabled: false, group: "Player", incompatibilites: [GameplayModifiers_GameOptions.InstaFail, GameplayModifiers_GameOptions.BatteryEnergy] }, - { id: GameplayModifiers_GameOptions.InstaFail, name: "One Life", description: "You only have one life", enabled: false, group: "Player", incompatibilites: [GameplayModifiers_GameOptions.NoFail, GameplayModifiers_GameOptions.BatteryEnergy] }, - { id: GameplayModifiers_GameOptions.BatteryEnergy, name: "Four Lives", description: "You have four lives", enabled: false, group: "Player", incompatibilites: [GameplayModifiers_GameOptions.NoFail, GameplayModifiers_GameOptions.InstaFail] }, - { id: GameplayModifiers_GameOptions.NoBombs, name: "No Bombs", description: "No bombs will appear", enabled: false, group: "Player" }, - { id: GameplayModifiers_GameOptions.NoObstacles, name: "No Walls", description: "No walls will appear", enabled: false, group: "Player" }, - { id: GameplayModifiers_GameOptions.NoArrows, name: "No Arrows", description: "All notes can be cut in any direction", enabled: false, group: "Player", incompatibilites: [GameplayModifiers_GameOptions.DisappearingArrows] }, - { id: GameplayModifiers_GameOptions.GhostNotes, name: "Ghost Notes", description: "Note colors are hidden", enabled: false, group: "Player" }, - { id: GameplayModifiers_GameOptions.DisappearingArrows, name: "Disappearing Arrows", description: "Arrows disappear as they approach you", enabled: false, group: "Player", incompatibilites: [GameplayModifiers_GameOptions.NoArrows] }, - - // Speed modifiers - { id: GameplayModifiers_GameOptions.SlowSong, name: "Slower Song", description: "Reduces the song speed by 15%", enabled: false, group: "Speed", incompatibilites: [GameplayModifiers_GameOptions.FastSong, GameplayModifiers_GameOptions.SuperFastSong] }, - { id: GameplayModifiers_GameOptions.FastSong, name: "Faster Song", description: "Increases the song speed by 20%", enabled: false, group: "Speed", incompatibilites: [GameplayModifiers_GameOptions.SlowSong, GameplayModifiers_GameOptions.SuperFastSong] }, - { id: GameplayModifiers_GameOptions.SuperFastSong, name: "Super Fast Song", description: "Increases the song speed by 50%", enabled: false, group: "Speed", incompatibilites: [GameplayModifiers_GameOptions.SlowSong, GameplayModifiers_GameOptions.FastSong] }, - - // Environment modifiers - { id: GameplayModifiers_GameOptions.SmallCubes, name: "Small Notes", description: "Notes are smaller", enabled: false, group: "Environment", incompatibilites: [GameplayModifiers_GameOptions.ProMode] }, - { id: GameplayModifiers_GameOptions.ProMode, name: "Pro Mode", description: "Makes notes smaller, removes debris, and adds hit scores", enabled: false, group: "Environment", incompatibilites: [GameplayModifiers_GameOptions.SmallCubes] }, - { id: GameplayModifiers_GameOptions.ZenMode, name: "Zen Mode", description: "No fail, no bombs, reduced obstacles", enabled: false, group: "Environment" }, - { id: GameplayModifiers_GameOptions.StrictAngles, name: "Strict Angles", description: "Stricter angle enforcement for cuts", enabled: false, group: "Environment" } - ]; + const modifierNameMap: Record = { + [GameplayModifiers_GameOptions.None]: "", + [GameplayModifiers_GameOptions.NoFail]: "No Fail", + [GameplayModifiers_GameOptions.NoBombs]: "No Bombs", + [GameplayModifiers_GameOptions.NoArrows]: "No Arrows", + [GameplayModifiers_GameOptions.NoObstacles]: "No Walls", + [GameplayModifiers_GameOptions.SlowSong]: "Slower Song", + [GameplayModifiers_GameOptions.InstaFail]: "One Life", + [GameplayModifiers_GameOptions.FailOnClash]: "Fail on Clash", + [GameplayModifiers_GameOptions.BatteryEnergy]: "Four Lives", + [GameplayModifiers_GameOptions.FastNotes]: "Fast Notes", + [GameplayModifiers_GameOptions.FastSong]: "Faster Song", + [GameplayModifiers_GameOptions.DisappearingArrows]: "Disappearing Arrows", + [GameplayModifiers_GameOptions.GhostNotes]: "Ghost Notes", + [GameplayModifiers_GameOptions.DemoNoFail]: "Demo No Fail", + [GameplayModifiers_GameOptions.DemoNoObstacles]: "Demo No Obstacles", + [GameplayModifiers_GameOptions.StrictAngles]: "Strict Angles", + [GameplayModifiers_GameOptions.ProMode]: "Pro Mode", + [GameplayModifiers_GameOptions.ZenMode]: "Zen Mode", + [GameplayModifiers_GameOptions.SmallCubes]: "Small Notes", + [GameplayModifiers_GameOptions.SuperFastSong]: "Super Fast Song" + }; // Edit Map Modal state let showEditMapModal: boolean = false; @@ -147,7 +148,9 @@ showSuccessNotification = false; } - function handleMapUpdated(event: CustomEvent) { + async function handleMapUpdated(event: CustomEvent) { + const res = await client.updateTournamentPoolMap(tournamentGuid, poolGuid, event.detail.map); + console.log(res) fetchMapPoolData(); showSuccessNotification = true; successMessage = "Map successfully updated!"; @@ -211,10 +214,11 @@ if (joinResult.details.oneofKind !== 'join' || joinResult.type === Response_ResponseType.Fail) { throw new Error('Could not join tournament'); } - } + } tournament = client.stateManager.getTournament(tournamentGuid)!; + client.stateManager.on('tournamentUpdated', (data) => console.log("updateGlobal", data)); // Find the map pool with the specified GUID const pool = await tournament?.settings?.pools.find(p => p.guid === poolGuid); @@ -224,8 +228,9 @@ } poolName = pool.name; + maps = []; await pool.maps.map(async(map) => { - console.log(map); + console.log("mapData that was newly fetched", map); let beatsaverData = await getMapBeatsaverData(map.gameplayParameters!.beatmap!.levelId); maps = [...maps, { taData: map, @@ -233,6 +238,9 @@ }]; }); + client.on('failedToUpdateTournament', (data) => {console.log("tourneyUpdate", data)}) + client.stateManager.on('tournamentUpdated', (data) => {console.log("tourneyUpdateSM", data)}); + maps = maps; } catch (err) { console.error('Error fetching map pool data:', err); @@ -255,6 +263,39 @@ return response; } + + function getActiveModifiersCompact(gameplayModifiers: number): string[] { + const activeModifiers: string[] = []; + + // Get all numeric enum values and sort them + const values = Object.values(GameplayModifiers_GameOptions) + .filter((value): value is number => + typeof value === 'number' && + value !== GameplayModifiers_GameOptions.None + ) + .sort((a, b) => a - b); + + console.log(values) + + for (const value of values) { + if (gameplayModifiers & value) { + const name = modifierNameMap[value]; + if (name && name.trim() !== "") { + activeModifiers.push(name); + } + } + } + + return activeModifiers; + } + + function getModifierArray(map: any): string[] { + if (map.taData.gameplayParameters?.gameplayModifiers.options == 0) { + return []; + } + + return getActiveModifiersCompact(map.taData.gameplayParameters.gameplayModifiers); + } onMount(async() => { if ($authTokenStore) { @@ -340,12 +381,12 @@ {MapDifficulty[map.taData.gameplayParameters?.beatmap?.difficulty]} {/if} - + {/if}
@@ -368,13 +409,11 @@
Active Modifiers
- + {/each}
@@ -394,6 +433,7 @@ on:close={closeEditMapModal} on:mapUpdated={handleMapUpdated} on:mapAdded={handleMapAdded} + mode='playing' /> {/if} @@ -706,19 +746,30 @@ flex-wrap: wrap; gap: 0.5rem; } - + .modifier-tag { background-color: var(--bg-tertiary); - padding: 0.25rem 0.5rem; + padding: 0.25rem 0.75rem; border-radius: 1rem; - font-size: 0.75rem; + font-size: 0.8rem; + font-weight: 500; + display: flex; + align-items: center; + gap: 0.25rem; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); } - + + .modifier-tag::before { + content: "•"; + color: var(--accent-color); + font-weight: bold; + } + .no-modifiers { color: var(--text-secondary); - font-size: 0.875rem; - font-style: italic; - } + font-size: 0.875rem; + font-style: italic; +} /* No maps state */ .no-maps { diff --git a/src/routes/tournaments/[tournamentguid]/matches/[matchGuid]/+page.svelte b/src/routes/tournaments/[tournamentguid]/matches/[matchGuid]/+page.svelte new file mode 100644 index 0000000..e7bcf7b --- /dev/null +++ b/src/routes/tournaments/[tournamentguid]/matches/[matchGuid]/+page.svelte @@ -0,0 +1,967 @@ + + +
+
+
+
+
+ + +
+

Match: {'Unknown'}

+

{tournament?.settings?.tournamentName}

+
+
+
+ +
+
+ + {#if isLoading} +
+ +

Loading match data...

+
+ {:else if error} +
+ error_outline +

{error}

+ +
+ {:else} +
+ +
+

Current Song

+ {#if currentSong && currentSongData} +
+
+ Song Cover +
+
+

{currentSong.name || 'Unknown Song'}

+

{currentSongData.metadata.songAuthorName || 'Unknown Artist'}

+
+
+ {:else} +
+ music_note +

No song selected

+
+ {/if} + +
+ + + {#if isMatchActive} + + {/if} +
+
+ + +
+

Players ({matchPlayers.length})

+ {#if matchPlayers.length === 0} +
+ person_off +

No players in match

+
+ {:else} +
+ {#each matchPlayers as player} +
+
+ +
+

{player.name} ({player.discordInfo?.username || 'Unknown'})

+

{getStatusText(player.playState)}

+
+ +
+ {/each} +
+ {/if} +
+ + +
+

Song Queue

+
+ queue_music +

Queue feature coming soon

+
+
+
+ {/if} +
+
+
+ + +{#if showKickConfirmModal} + + +
showKickConfirmModal = false}> + +
+
+ warning +

Kick Player

+
+
+

Are you sure you want to kick {playerToKick?.name} from the match?

+
+
+ + +
+
+
+{/if} + + + +{#if showBackToMenuModal} + + +
showBackToMenuModal = false}> +
+
+ warning +

Back to Menu

+
+
+

This will send all players back to the menu and stop the current song. Continue?

+
+
+ + +
+
+
+{/if} + + + +{#if showExitMatchModal} + +
showExitMatchModal = false}> +
+
+ warning +

Exit Match

+
+
+

Players are currently in-game. Exiting will close the match for all players. Continue?

+
+
+ + +
+
+
+{/if} + + \ No newline at end of file diff --git a/src/routes/tournaments/[tournamentguid]/matches/[matchGuid]/+page.ts b/src/routes/tournaments/[tournamentguid]/matches/[matchGuid]/+page.ts new file mode 100644 index 0000000..f6ecc51 --- /dev/null +++ b/src/routes/tournaments/[tournamentguid]/matches/[matchGuid]/+page.ts @@ -0,0 +1,7 @@ +export function load({ params }: any){ + return { + tournamentGuid: params.tournamentguid, + matchGuid: params.matchGuid, + params: params + } +} \ No newline at end of file