diff --git a/src/routes/scene/+page.svelte b/src/routes/scene/+page.svelte index 745410c..0ae6fd1 100644 --- a/src/routes/scene/+page.svelte +++ b/src/routes/scene/+page.svelte @@ -21,13 +21,13 @@ return friend ? friend.friend.name : userId.slice(0, 8) + "..."; } - function getFriendDollConfig(userId: string) { + function getFriendDoll(userId: string) { if (userId in $friendsActiveDolls) { - return $friendsActiveDolls[userId]?.configuration; + return $friendsActiveDolls[userId]; } const friend = $appData?.friends?.find((f) => f.friend.id === userId); - return friend?.friend.activeDoll?.configuration; + return friend?.friend.activeDoll; } @@ -67,7 +67,7 @@
{#each Object.entries($friendsCursorPositions) as [userId, position]} - {@const dollConfig = getFriendDollConfig(userId)} + {@const dollConfig = getFriendDoll(userId)}
{getFriendName(userId)}
@@ -88,14 +88,14 @@
{#if Object.keys($friendsCursorPositions).length > 0} {#each Object.entries($friendsCursorPositions) as [userId, position]} - {@const config = getFriendDollConfig(userId)} - {#if config} + {@const doll = getFriendDoll(userId)} + {#if doll} {/if} diff --git a/src/routes/scene/components/DesktopPet.svelte b/src/routes/scene/components/DesktopPet.svelte index 54c8aff..27c6ad7 100644 --- a/src/routes/scene/components/DesktopPet.svelte +++ b/src/routes/scene/components/DesktopPet.svelte @@ -6,13 +6,13 @@ import PetSprite from "$lib/components/PetSprite.svelte"; import onekoGif from "../../../assets/oneko/oneko.gif"; import PetMenu from "./PetMenu.svelte"; - import type { DollConfigurationDto } from "../../../types/bindings/DollConfigurationDto"; + import type { DollDto } from "../../../types/bindings/DollDto"; export let id = ""; export let targetX = 0; export let targetY = 0; export let name = ""; - export let config: DollConfigurationDto | undefined = undefined; + export let doll: DollDto | undefined = undefined; export let isInteractive = false; const { position, currentSprite, updatePosition, setPosition } = usePetState( @@ -27,7 +27,7 @@ let isPetMenuOpen = false; // Watch for color changes to regenerate sprite - $: updateSprite(config?.colorScheme.body, config?.colorScheme.outline); + $: updateSprite(doll?.configuration.colorScheme.body, doll?.configuration.colorScheme.outline); $: (isInteractive, (isPetMenuOpen = false)); @@ -92,8 +92,8 @@ tabindex="0" aria-label="Pet Menu" > - {#if config} - + {#if doll} + {/if}
{/if} diff --git a/src/routes/scene/components/PetMenu.svelte b/src/routes/scene/components/PetMenu.svelte index 3b99dd4..20668be 100644 --- a/src/routes/scene/components/PetMenu.svelte +++ b/src/routes/scene/components/PetMenu.svelte @@ -1,10 +1,10 @@
-

{config.colorScheme.body}

+

{doll.name}