From f7b8c235d8dfe615a49c4ea0f72fc4bfc9402504 Mon Sep 17 00:00:00 2001
From: Dennis Postma <dennis@directonline.io>
Date: Sun, 24 Nov 2024 15:13:11 +0100
Subject: [PATCH] Renamed hair > characterHair, split character logic (chat
 bubble, healthbar etc) into separate components for better DX

---
 package-lock.json                             |  6 +-
 src/components/game/character/Character.vue   | 68 ++-----------------
 .../game/character/partials/CharacterHair.vue | 50 ++++++++++++++
 .../game/character/partials/ChatBubble.vue    | 46 +++++++++++++
 .../game/character/partials/Healthbar.vue     | 35 ++++++++++
 .../game/zone/partials/ZoneObject.vue         |  2 +-
 src/components/screens/Characters.vue         |  6 +-
 src/composables/gameComposable.ts             |  2 +
 src/stores/gameStore.ts                       |  5 +-
 src/types.ts                                  |  8 +--
 10 files changed, 153 insertions(+), 75 deletions(-)
 create mode 100644 src/components/game/character/partials/CharacterHair.vue
 create mode 100644 src/components/game/character/partials/Healthbar.vue

diff --git a/package-lock.json b/package-lock.json
index d0efd8e..0ae476e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3147,9 +3147,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001683",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001683.tgz",
-      "integrity": "sha512-iqmNnThZ0n70mNwvxpEC2nBJ037ZHZUoBI5Gorh1Mw6IlEAZujEoU1tXA628iZfzm7R9FvFzxbfdgml82a3k8Q==",
+      "version": "1.0.30001684",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz",
+      "integrity": "sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ==",
       "dev": true,
       "funding": [
         {
diff --git a/src/components/game/character/Character.vue b/src/components/game/character/Character.vue
index 1b5bf1a..f682b05 100644
--- a/src/components/game/character/Character.vue
+++ b/src/components/game/character/Character.vue
@@ -1,19 +1,8 @@
 <template>
-  <!--  Chat bubble -->
-  <Container ref="charChatContainer" :depth="999" :x="currentX" :y="currentY">
-    <RoundRectangle @create="createChatBubble" :origin-x="0.5" :origin-y="7.5" :fillColor="0xffffff" :width="194" :height="21" :radius="20" />
-    <Text @create="createChatText" :style="{ fontSize: 13, fontFamily: 'Arial', color: '#000' }" />
-  </Container>
-  <!--  Character name and health -->
-  <Container :depth="999" :x="currentX" :y="currentY">
-    <Text @create="createNicknameText" :text="props.zoneCharacter.character.name" />
-    <RoundRectangle :origin-x="0.5" :origin-y="18.5" :fillColor="0xffffff" :width="74" :height="6" :radius="5" />
-    <RoundRectangle :origin-x="0.5" :origin-y="36.4" :fillColor="0x00b3b3" :width="70" :height="3" :radius="5" />
-  </Container>
-  <!--  Character sprite -->
+  <ChatBubble :zoneCharacter="props.zoneCharacter" :currentX="currentX" :currentY="currentY" />
+  <Healthbar :zoneCharacter="props.zoneCharacter" :currentX="currentX" :currentY="currentY" />
   <Container ref="charContainer" :depth="isometricDepth" :x="currentX" :y="currentY">
-    <!--    HAIR-->
-    <Image :origin-y="4.2" :depth="1" :texture="props.zoneCharacter.character.hair?.spriteId + '-front'" />
+    <CharacterHair :zoneCharacter="props.zoneCharacter" :currentX="currentX" :currentY="currentY" />
     <Sprite ref="charSprite" :origin-y="1" :flipX="isFlippedX" :flipY="false" />
   </Container>
 </template>
@@ -27,22 +16,24 @@ import { watch, computed, ref, onMounted, onUnmounted } from 'vue'
 import { Container, Image, refObj, RoundRectangle, Sprite, Text, useGame, useScene } from 'phavuer'
 import { calculateIsometricDepth, tileToWorldX, tileToWorldY } from '@/composables/zoneComposable'
 import { loadSpriteTextures } from '@/composables/gameComposable'
+import ChatBubble from '@/components/game/character/partials/ChatBubble.vue'
+import Healthbar from '@/components/game/character/partials/Healthbar.vue'
+import CharacterHair from '@/components/game/character/partials/CharacterHair.vue'
 
 enum Direction {
   POSITIVE,
   NEGATIVE,
   UNCHANGED
 }
+
 const props = defineProps<{
   layer: Phaser.Tilemaps.TilemapLayer
   zoneCharacter: ZoneCharacter
 }>()
 
-const charChatContainer = refObj<Phaser.GameObjects.Container>()
 const charContainer = refObj<Phaser.GameObjects.Container>()
 const charSprite = refObj<Phaser.GameObjects.Sprite>()
 
-const game = useGame()
 const gameStore = useGameStore()
 const zoneStore = useZoneStore()
 const scene = useScene()
@@ -133,41 +124,6 @@ const updateSprite = () => {
   charSprite.value!.setTexture(charTexture.value)
 }
 
-const createChatBubble = (container: Phaser.GameObjects.Container) => {
-  container.setName(`${props.zoneCharacter.character.name}_chatBubble`)
-}
-
-const createChatText = (text: Phaser.GameObjects.Text) => {
-  text.setName(`${props.zoneCharacter.character.name}_chatText`)
-  text.setFontSize(13)
-  text.setFontFamily('Arial')
-  text.setOrigin(0.5, 10.9)
-
-  // Fix text alignment on Windows and Android
-  if (game.device.os.windows || game.device.os.android) {
-    text.setOrigin(0.5, 9.75)
-
-    if (game.device.browser.firefox) {
-      text.setOrigin(0.5, 10.9)
-    }
-  }
-}
-
-const createNicknameText = (text: Phaser.GameObjects.Text) => {
-  text.setFontSize(13)
-  text.setFontFamily('Arial')
-  text.setOrigin(0.5, 9)
-
-  // Fix text alignment on Windows and Android
-  if (game.device.os.windows || game.device.os.android) {
-    text.setOrigin(0.5, 8)
-
-    if (game.device.browser.firefox) {
-      text.setOrigin(0.5, 9)
-    }
-  }
-}
-
 watch(
   () => props.zoneCharacter.character,
   (newChar, oldChar) => {
@@ -182,14 +138,6 @@ watch(
 
 watch(() => props.zoneCharacter, updateSprite)
 
-
-// Hair demo
-loadSpriteTextures(scene, props.zoneCharacter.character.hair?.sprite as SpriteT)
-  .then(() => {})
-  .catch((error) => {
-    console.error('Error loading texture:', error)
-  })
-
 loadSpriteTextures(scene, props.zoneCharacter.character.characterType?.sprite as SpriteT)
   .then(() => {
     charSprite.value!.setTexture(charTexture.value)
@@ -200,8 +148,6 @@ loadSpriteTextures(scene, props.zoneCharacter.character.characterType?.sprite as
   })
 
 onMounted(() => {
-  charChatContainer.value!.setName(`${props.zoneCharacter.character!.name}_chatContainer`)
-  charChatContainer.value!.setVisible(false)
   charContainer.value!.setName(props.zoneCharacter.character!.name)
 
   if (props.zoneCharacter.character.id === gameStore.character!.id) {
diff --git a/src/components/game/character/partials/CharacterHair.vue b/src/components/game/character/partials/CharacterHair.vue
new file mode 100644
index 0000000..0fabfde
--- /dev/null
+++ b/src/components/game/character/partials/CharacterHair.vue
@@ -0,0 +1,50 @@
+<template>
+  <Image v-bind="imageProps" v-if="gameStore.getLoadedAsset(props.zoneCharacter.character.characterHair?.spriteId)" ref="image" />
+</template>
+
+<script lang="ts" setup>
+import { computed } from 'vue'
+import { Image, refObj, useScene } from 'phavuer'
+import type { Sprite as SpriteT, ZoneCharacter } from '@/types'
+import { loadSpriteTextures } from '@/composables/gameComposable'
+import { useGameStore } from '@/stores/gameStore'
+
+const props = defineProps<{
+  zoneCharacter: ZoneCharacter
+  currentX: number
+  currentY: number
+}>()
+
+const gameStore = useGameStore()
+const scene = useScene()
+
+const image = refObj<Phaser.GameObjects.Image>()
+const isFlippedX = computed(() => [6, 4].includes(props.zoneCharacter.character.rotation ?? 0))
+
+const texture = computed(() => {
+  const { rotation, characterHair } = props.zoneCharacter.character
+  const spriteId = characterHair?.sprite?.id
+  const direction = [0, 6].includes(rotation) ? 'back' : 'front'
+
+  return `${spriteId}-${direction}`
+})
+
+const imageProps = computed(() => ({
+  depth: 1,
+  x: props.currentX,
+  y: props.currentY,
+  flipX: false,
+  texture: texture.value,
+}))
+
+loadSpriteTextures(scene, props.zoneCharacter.character.characterHair?.sprite as SpriteT)
+  .then(() => {
+    console.log(texture.value)
+    image.value!.setTexture(texture.value!)
+    image.value!.setFlipX(isFlippedX.value)
+  })
+  .catch((error) => {
+    console.error('Error loading texture:', error)
+  })
+
+</script>
\ No newline at end of file
diff --git a/src/components/game/character/partials/ChatBubble.vue b/src/components/game/character/partials/ChatBubble.vue
index e69de29..b1be974 100644
--- a/src/components/game/character/partials/ChatBubble.vue
+++ b/src/components/game/character/partials/ChatBubble.vue
@@ -0,0 +1,46 @@
+<template>
+  <Container ref="charChatContainer" :depth="999" :x="currentX" :y="currentY">
+    <RoundRectangle @create="createChatBubble" :origin-x="0.5" :origin-y="7.5" :fillColor="0xffffff" :width="194" :height="21" :radius="20" />
+    <Text @create="createChatText" :style="{ fontSize: 13, fontFamily: 'Arial', color: '#000' }" />
+  </Container>
+</template>
+
+<script setup lang="ts">
+import { Container, refObj, RoundRectangle, Text, useGame } from 'phavuer'
+import type { ZoneCharacter } from '@/types'
+import { onMounted } from 'vue'
+
+const props = defineProps<{
+  zoneCharacter: ZoneCharacter
+  currentX: number
+  currentY: number
+}>()
+
+const game = useGame()
+const charChatContainer = refObj<Phaser.GameObjects.Container>()
+
+const createChatBubble = (container: Phaser.GameObjects.Container) => {
+  container.setName(`${props.zoneCharacter.character.name}_chatBubble`)
+}
+
+const createChatText = (text: Phaser.GameObjects.Text) => {
+  text.setName(`${props.zoneCharacter.character.name}_chatText`)
+  text.setFontSize(13)
+  text.setFontFamily('Arial')
+  text.setOrigin(0.5, 10.9)
+
+  // Fix text alignment on Windows and Android
+  if (game.device.os.windows || game.device.os.android) {
+    text.setOrigin(0.5, 9.75)
+
+    if (game.device.browser.firefox) {
+      text.setOrigin(0.5, 10.9)
+    }
+  }
+}
+
+onMounted(() => {
+  charChatContainer.value!.setName(`${props.zoneCharacter.character!.name}_chatContainer`)
+  charChatContainer.value!.setVisible(false)
+})
+</script>
\ No newline at end of file
diff --git a/src/components/game/character/partials/Healthbar.vue b/src/components/game/character/partials/Healthbar.vue
new file mode 100644
index 0000000..19fc0f4
--- /dev/null
+++ b/src/components/game/character/partials/Healthbar.vue
@@ -0,0 +1,35 @@
+<template>
+  <Container :depth="999" :x="currentX" :y="currentY">
+    <Text @create="createNicknameText" :text="props.zoneCharacter.character.name" />
+    <RoundRectangle :origin-x="0.5" :origin-y="18.5" :fillColor="0xffffff" :width="74" :height="6" :radius="5" />
+    <RoundRectangle :origin-x="0.5" :origin-y="36.4" :fillColor="0x00b3b3" :width="70" :height="3" :radius="5" />
+  </Container>
+</template>
+
+<script setup lang="ts">
+import { Container, RoundRectangle, Text, useGame } from 'phavuer'
+import type { ZoneCharacter } from '@/types'
+
+const props = defineProps<{
+  zoneCharacter: ZoneCharacter
+  currentX: number
+  currentY: number
+}>()
+
+const game = useGame()
+
+const createNicknameText = (text: Phaser.GameObjects.Text) => {
+  text.setFontSize(13)
+  text.setFontFamily('Arial')
+  text.setOrigin(0.5, 9)
+
+  // Fix text alignment on Windows and Android
+  if (game.device.os.windows || game.device.os.android) {
+    text.setOrigin(0.5, 8)
+
+    if (game.device.browser.firefox) {
+      text.setOrigin(0.5, 9)
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/game/zone/partials/ZoneObject.vue b/src/components/game/zone/partials/ZoneObject.vue
index a3678ae..6ef72ea 100644
--- a/src/components/game/zone/partials/ZoneObject.vue
+++ b/src/components/game/zone/partials/ZoneObject.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted } from 'vue'
+import { computed } from 'vue'
 import { Image, useScene } from 'phavuer'
 import { calculateIsometricDepth, tileToWorldX, tileToWorldY } from '@/composables/zoneComposable'
 import { loadTexture } from '@/composables/gameComposable'
diff --git a/src/components/screens/Characters.vue b/src/components/screens/Characters.vue
index 48c1264..6c5ead5 100644
--- a/src/components/screens/Characters.vue
+++ b/src/components/screens/Characters.vue
@@ -166,10 +166,6 @@ const deletingCharacter = ref(null as CharacterT | null)
 const hairs = ref([] as CharacterHair[])
 const selectedHair = ref(null as CharacterHair | null)
 
-watch(selectedHair, (hair: CharacterHair | null) => {
-  console.log(hair)
-})
-
 // Fetch characters
 gameStore.connection?.on('character:list', (data: any) => {
   characters.value = data
@@ -194,7 +190,7 @@ function select_character() {
   deletingCharacter.value = null
   gameStore.connection?.emit('character:connect', {
     characterId: selected_character.value,
-    hairId: selectedHair.value?.id
+    characterHairId: selectedHair.value?.id
   })
   gameStore.connection?.on('character:connect', (data: CharacterT) => gameStore.setCharacter(data))
 }
diff --git a/src/composables/gameComposable.ts b/src/composables/gameComposable.ts
index 7e7ea7a..eb3d1f3 100644
--- a/src/composables/gameComposable.ts
+++ b/src/composables/gameComposable.ts
@@ -57,6 +57,8 @@ export async function loadTexture(scene: Phaser.Scene, assetData: AssetDataT): P
 }
 
 export async function loadSpriteTextures(scene: Phaser.Scene, sprite: Sprite) {
+  if (!sprite) return
+
   const sprite_actions = await fetch(config.server_endpoint + '/assets/list_sprite_actions/' + sprite?.id).then((response) => response.json())
   for await (const sprite_action of sprite_actions) {
     await loadTexture(scene, {
diff --git a/src/stores/gameStore.ts b/src/stores/gameStore.ts
index 3697758..ae2439a 100644
--- a/src/stores/gameStore.ts
+++ b/src/stores/gameStore.ts
@@ -38,7 +38,10 @@ export const useGameStore = defineStore('game', {
       return state.game.loadedAssets
     },
     getLoadedAsset: (state) => {
-      return (key: string) => state.game.loadedAssets.find((asset) => asset.key === key)
+      return (key: string | undefined) => {
+        if (!key) return null
+        return state.game.loadedAssets.find((asset) => asset.key === key)
+      }
     },
     getLoadedAssetsByGroup: (state) => {
       return (group: string) => state.game.loadedAssets.filter((asset) => asset.group === group)
diff --git a/src/types.ts b/src/types.ts
index dce086c..71df9c4 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -169,12 +169,12 @@ export type Character = {
   positionX: number
   positionY: number
   rotation: number
-  zoneId: number
-  zone: Zone
   characterTypeId: number | null
   characterType: CharacterType | null
-  hairId: number | null
-  hair: CharacterHair | null
+  characterHairId: number | null
+  characterHair: CharacterHair | null
+  zoneId: number
+  zone: Zone
   chats: Chat[]
   items: CharacterItem[]
 }