From 6ec9f8a7bc84456076be029cb4bf6e8bace9431e Mon Sep 17 00:00:00 2001
From: Dennis Postma <dennis@directonline.io>
Date: Wed, 1 Jan 2025 18:16:31 +0100
Subject: [PATCH] Loading char. texture works again

---
 src/application/types.ts                    | 2 +-
 src/components/game/character/Character.vue | 4 ++--
 src/composables/gameComposable.ts           | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/application/types.ts b/src/application/types.ts
index 62d50d7..d01873c 100644
--- a/src/application/types.ts
+++ b/src/application/types.ts
@@ -183,7 +183,7 @@ export type Character = {
   positionY: number
   rotation: number
   characterTypeId: number | null
-  characterType: CharacterType | null
+  characterType: CharacterType | null | string
   characterHairId: number | null
   characterHair: CharacterHair | null
   zoneId: number
diff --git a/src/components/game/character/Character.vue b/src/components/game/character/Character.vue
index 4901bf4..b0cd69b 100644
--- a/src/components/game/character/Character.vue
+++ b/src/components/game/character/Character.vue
@@ -108,7 +108,7 @@ const isFlippedX = computed(() => [6, 4].includes(props.zoneCharacter.character.
 
 const charTexture = computed(() => {
   const { rotation, characterType } = props.zoneCharacter.character
-  const spriteId = characterType?.sprite?.id ?? 'idle_right_down'
+  const spriteId = characterType?.sprite ?? 'idle_right_down'
   const action = props.zoneCharacter.isMoving ? 'walk' : 'idle'
   const direction = [0, 6].includes(rotation) ? 'left_up' : 'right_down'
 
@@ -148,7 +148,7 @@ watch(
 
 watch(() => props.zoneCharacter, updateSprite)
 
-loadSpriteTextures(scene, props.zoneCharacter.character.characterType?.sprite as SpriteT)
+loadSpriteTextures(scene, props.zoneCharacter.character.characterType?.sprite as string)
   .then(() => {
     charSprite.value!.setTexture(charTexture.value)
     charSprite.value!.setFlipX(isFlippedX.value)
diff --git a/src/composables/gameComposable.ts b/src/composables/gameComposable.ts
index aeff449..b521737 100644
--- a/src/composables/gameComposable.ts
+++ b/src/composables/gameComposable.ts
@@ -56,11 +56,11 @@ export async function loadTexture(scene: Phaser.Scene, assetData: AssetDataT): P
   return loadingPromise
 }
 
-export async function loadSpriteTextures(scene: Phaser.Scene, sprite: Sprite) {
-  if (!sprite) return
+export async function loadSpriteTextures(scene: Phaser.Scene, sprite_id: string) {
+  if (!sprite_id) return
 
   // @TODO: Fix this
-  const sprite_actions: HttpResponse<any[]> = await fetch(config.server_endpoint + '/assets/list_sprite_actions/' + sprite?.id).then((response) => response.json())
+  const sprite_actions: HttpResponse<any[]> = await fetch(config.server_endpoint + '/assets/list_sprite_actions/' + sprite_id).then((response) => response.json())
 
   for await (const sprite_action of sprite_actions.data ?? []) {
     await loadTexture(scene, {