From 231f19a30fc04ceb586fdf250951c88ab8bc68a0 Mon Sep 17 00:00:00 2001
From: Dennis Postma <dennis@directonline.io>
Date: Fri, 27 Dec 2024 00:27:54 +0100
Subject: [PATCH] Added characterChest component for chest equipment, moved
 some files

---
 src/{ => application}/config.ts               |  0
 src/{ => application}/types.ts                | 24 ++++++++-
 src/{ => application}/utilities.ts            |  0
 src/components/Effects.vue                    |  2 +-
 src/components/game/character/Character.vue   |  8 +--
 .../character/partials/CharacterChest.vue     | 53 +++++++++++++++++++
 .../game/character/partials/CharacterHair.vue |  2 +-
 .../game/character/partials/ChatBubble.vue    |  2 +-
 .../game/character/partials/Healthbar.vue     |  2 +-
 src/components/game/zone/Zone.vue             |  6 +--
 src/components/game/zone/ZoneTiles.vue        |  4 +-
 .../game/zone/partials/ZoneObject.vue         |  2 +-
 .../characterHair/CharacterHairDetails.vue    |  2 +-
 .../characterHair/CharacterHairList.vue       |  2 +-
 .../characterType/CharacterTypeDetails.vue    |  2 +-
 .../characterType/CharacterTypeList.vue       |  2 +-
 .../partials/item/itemDetails.vue             |  2 +-
 .../assetManager/partials/item/itemList.vue   |  2 +-
 .../partials/object/ObjectDetails.vue         |  4 +-
 .../partials/object/ObjectList.vue            |  4 +-
 .../partials/sprite/SpriteDetails.vue         |  4 +-
 .../partials/sprite/SpriteList.vue            |  4 +-
 .../partials/tile/TileDetails.vue             |  4 +-
 .../assetManager/partials/tile/TileList.vue   |  4 +-
 .../gameMaster/zoneEditor/ZoneEditor.vue      |  2 +-
 .../zoneEditor/partials/CreateZone.vue        |  2 +-
 .../zoneEditor/partials/ObjectList.vue        |  4 +-
 .../partials/SelectedZoneObject.vue           |  2 +-
 .../zoneEditor/partials/TeleportModal.vue     |  2 +-
 .../zoneEditor/partials/TileList.vue          |  4 +-
 .../zoneEditor/partials/ZoneList.vue          |  2 +-
 .../zonePartials/ZoneEventTiles.vue           |  4 +-
 .../zoneEditor/zonePartials/ZoneObject.vue    |  2 +-
 .../zoneEditor/zonePartials/ZoneObjects.vue   |  4 +-
 .../zoneEditor/zonePartials/ZoneTiles.vue     |  4 +-
 src/components/gui/Chat.vue                   |  2 +-
 src/components/screens/Characters.vue         |  4 +-
 src/components/screens/Game.vue               |  2 +-
 src/components/screens/ZoneEditor.vue         |  4 +-
 src/composables/gameComposable.ts             |  4 +-
 .../pointerHandlers/useGamePointerHandlers.ts |  2 +-
 .../useZoneEditorPointerHandlers.ts           |  2 +-
 src/composables/zoneComposable.ts             |  4 +-
 src/services/authentication.ts                |  4 +-
 src/storage/assetStorage.ts                   |  4 +-
 src/stores/assetManagerStore.ts               |  2 +-
 src/stores/gameStore.ts                       |  6 +--
 src/stores/zoneEditorStore.ts                 |  2 +-
 src/stores/zoneStore.ts                       | 11 +++-
 49 files changed, 156 insertions(+), 70 deletions(-)
 rename src/{ => application}/config.ts (100%)
 rename src/{ => application}/types.ts (91%)
 rename src/{ => application}/utilities.ts (100%)
 create mode 100644 src/components/game/character/partials/CharacterChest.vue

diff --git a/src/config.ts b/src/application/config.ts
similarity index 100%
rename from src/config.ts
rename to src/application/config.ts
diff --git a/src/types.ts b/src/application/types.ts
similarity index 91%
rename from src/types.ts
rename to src/application/types.ts
index 4e88cfc..16ee39a 100644
--- a/src/types.ts
+++ b/src/application/types.ts
@@ -4,6 +4,12 @@ export type Notification = {
   message?: string
 }
 
+export type HttpResponse<T> = {
+  success: boolean
+  message?: string
+  data?: T
+}
+
 export type AssetDataT = {
   key: string
   data: string
@@ -157,7 +163,6 @@ export type CharacterType = {
 export type CharacterHair = {
   id: number
   name: string
-  spriteId: string
   sprite: Sprite
   gender: CharacterGender
   isSelectable: boolean
@@ -185,6 +190,7 @@ export type Character = {
   zone: Zone
   chats: Chat[]
   items: CharacterItem[]
+  equipment: CharacterEquipment[]
 }
 
 export type ZoneCharacter = {
@@ -201,6 +207,22 @@ export type CharacterItem = {
   quantity: number
 }
 
+export type CharacterEquipment = {
+  id: number
+  slot: CharacterEquipmentSlotType
+  characterItemId: number
+  characterItem: CharacterItem
+}
+
+export enum CharacterEquipmentSlotType {
+  HEAD = 'HEAD',
+  BODY = 'BODY',
+  ARMS = 'ARMS',
+  LEGS = 'LEGS',
+  NECK = 'NECK',
+  RING = 'RING'
+}
+
 export type Sprite = {
   id: string
   name: string
diff --git a/src/utilities.ts b/src/application/utilities.ts
similarity index 100%
rename from src/utilities.ts
rename to src/application/utilities.ts
diff --git a/src/components/Effects.vue b/src/components/Effects.vue
index fa327b7..c9c100a 100644
--- a/src/components/Effects.vue
+++ b/src/components/Effects.vue
@@ -7,7 +7,7 @@ import { Scene } from 'phavuer'
 import { useZoneStore } from '@/stores/zoneStore'
 import { useGameStore } from '@/stores/gameStore'
 import { onBeforeUnmount, onMounted, ref, watch } from 'vue'
-import type { WeatherState } from '@/types'
+import type { WeatherState } from '@/application/types'
 
 // Constants
 const LIGHT_CONFIG = {
diff --git a/src/components/game/character/Character.vue b/src/components/game/character/Character.vue
index d90c953..38e4e04 100644
--- a/src/components/game/character/Character.vue
+++ b/src/components/game/character/Character.vue
@@ -3,22 +3,24 @@
   <Healthbar :zoneCharacter="props.zoneCharacter" :currentX="currentX" :currentY="currentY" />
   <Container ref="charContainer" :depth="isometricDepth" :x="currentX" :y="currentY">
     <CharacterHair :zoneCharacter="props.zoneCharacter" :currentX="currentX" :currentY="currentY" />
+<!--    <CharacterChest :zoneCharacter="props.zoneCharacter" :currentX="currentX" :currentY="currentY" />-->
     <Sprite ref="charSprite" :origin-y="1" :flipX="isFlippedX" />
   </Container>
 </template>
 
 <script lang="ts" setup>
-import config from '@/config'
-import { type Sprite as SpriteT, type ZoneCharacter } from '@/types'
+import config from '@/application/config'
+import { type Sprite as SpriteT, type ZoneCharacter } from '@/application/types'
 import { useGameStore } from '@/stores/gameStore'
 import { useZoneStore } from '@/stores/zoneStore'
 import { watch, computed, ref, onMounted, onUnmounted } from 'vue'
-import { Container, Image, refObj, RoundRectangle, Sprite, Text, useGame, useScene } from 'phavuer'
+import { Container, refObj, Sprite, 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'
+// import CharacterChest from '@/components/game/character/partials/CharacterChest.vue'
 
 enum Direction {
   POSITIVE,
diff --git a/src/components/game/character/partials/CharacterChest.vue b/src/components/game/character/partials/CharacterChest.vue
new file mode 100644
index 0000000..b64e942
--- /dev/null
+++ b/src/components/game/character/partials/CharacterChest.vue
@@ -0,0 +1,53 @@
+<template>
+  <Image v-bind="imageProps" v-if="gameStore.getLoadedAsset(texture)" />
+</template>
+
+<script lang="ts" setup>
+import { computed } from 'vue'
+import { Image, useScene } from 'phavuer'
+import type { Sprite as SpriteT, ZoneCharacter } from '@/application/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 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 isFlippedX = computed(() => [6, 4].includes(props.zoneCharacter.character.rotation ?? 0))
+
+const imageProps = computed(() => {
+  // Get the current sprite action based on direction
+  const direction = [0, 6].includes(props.zoneCharacter.character.rotation ?? 0) ? 'back' : 'front'
+  const spriteAction = props.zoneCharacter.character.characterHair?.sprite?.spriteActions?.find(
+    spriteAction => spriteAction.action === direction
+  )
+
+  return {
+    depth: 1,
+    originX: Number(spriteAction?.originX) ?? 0,
+    originY: Number(spriteAction?.originY) ?? 0,
+    flipX: isFlippedX.value,
+    texture: texture.value,
+    // y: props.zoneCharacter.isMoving ? Math.floor(Date.now() / 250) % 2 : 0
+  }
+})
+
+loadSpriteTextures(scene, props.zoneCharacter.character.characterHair?.sprite as SpriteT)
+  .then(() => {})
+  .catch((error) => {
+    console.error('Error loading texture:', error)
+  })
+</script>
diff --git a/src/components/game/character/partials/CharacterHair.vue b/src/components/game/character/partials/CharacterHair.vue
index a75a739..b8e25b6 100644
--- a/src/components/game/character/partials/CharacterHair.vue
+++ b/src/components/game/character/partials/CharacterHair.vue
@@ -5,7 +5,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue'
 import { Image, useScene } from 'phavuer'
-import type { Sprite as SpriteT, ZoneCharacter } from '@/types'
+import type { Sprite as SpriteT, ZoneCharacter } from '@/application/types'
 import { loadSpriteTextures } from '@/composables/gameComposable'
 import { useGameStore } from '@/stores/gameStore'
 
diff --git a/src/components/game/character/partials/ChatBubble.vue b/src/components/game/character/partials/ChatBubble.vue
index 2fb8083..2063037 100644
--- a/src/components/game/character/partials/ChatBubble.vue
+++ b/src/components/game/character/partials/ChatBubble.vue
@@ -7,7 +7,7 @@
 
 <script setup lang="ts">
 import { Container, refObj, RoundRectangle, Text, useGame } from 'phavuer'
-import type { ZoneCharacter } from '@/types'
+import type { ZoneCharacter } from '@/application/types'
 import { onMounted } from 'vue'
 
 const props = defineProps<{
diff --git a/src/components/game/character/partials/Healthbar.vue b/src/components/game/character/partials/Healthbar.vue
index 6e1b486..353b307 100644
--- a/src/components/game/character/partials/Healthbar.vue
+++ b/src/components/game/character/partials/Healthbar.vue
@@ -8,7 +8,7 @@
 
 <script setup lang="ts">
 import { Container, RoundRectangle, Text, useGame } from 'phavuer'
-import type { ZoneCharacter } from '@/types'
+import type { ZoneCharacter } from '@/application/types'
 
 const props = defineProps<{
   zoneCharacter: ZoneCharacter
diff --git a/src/components/game/zone/Zone.vue b/src/components/game/zone/Zone.vue
index 7675ecb..27370a4 100644
--- a/src/components/game/zone/Zone.vue
+++ b/src/components/game/zone/Zone.vue
@@ -10,7 +10,7 @@ import { useScene } from 'phavuer'
 import { useGameStore } from '@/stores/gameStore'
 import { useZoneStore } from '@/stores/zoneStore'
 import { loadZoneTilesIntoScene } from '@/composables/zoneComposable'
-import type { Zone as ZoneT, ZoneCharacter } from '@/types'
+import type { Zone as ZoneT, ZoneCharacter } from '@/application/types'
 import ZoneTiles from '@/components/game/zone/ZoneTiles.vue'
 import ZoneObjects from '@/components/game/zone/ZoneObjects.vue'
 import Characters from '@/components/game/zone/Characters.vue'
@@ -51,8 +51,8 @@ gameStore.connection!.on('zone:character:leave', (characterId: number) => {
   zoneStore.removeCharacter(characterId)
 })
 
-gameStore.connection!.on('character:move', (data: ZoneCharacter) => {
-  zoneStore.updateCharacter(data)
+gameStore.connection!.on('character:move', (data: { id: number, positionX: number, positionY: number, rotation: number, isMoving: boolean }) => {
+  zoneStore.updateCharacterPosition(data)
 })
 
 // Emit zone:character:join event to server and wait for response, then set zone and characters
diff --git a/src/components/game/zone/ZoneTiles.vue b/src/components/game/zone/ZoneTiles.vue
index 8494dfc..cfcfd89 100644
--- a/src/components/game/zone/ZoneTiles.vue
+++ b/src/components/game/zone/ZoneTiles.vue
@@ -3,13 +3,13 @@
 </template>
 
 <script setup lang="ts">
-import config from '@/config'
+import config from '@/application/config'
 import { useScene } from 'phavuer'
 import { useZoneStore } from '@/stores/zoneStore'
 import { onBeforeUnmount } from 'vue'
 import { FlattenZoneArray, setLayerTiles } from '@/composables/zoneComposable'
 import Controls from '@/components/utilities/Controls.vue'
-import { unduplicateArray } from '@/utilities'
+import { unduplicateArray } from '@/application/utilities'
 
 const emit = defineEmits(['tileMap:create'])
 
diff --git a/src/components/game/zone/partials/ZoneObject.vue b/src/components/game/zone/partials/ZoneObject.vue
index 6ef72ea..443c412 100644
--- a/src/components/game/zone/partials/ZoneObject.vue
+++ b/src/components/game/zone/partials/ZoneObject.vue
@@ -7,7 +7,7 @@ import { computed } from 'vue'
 import { Image, useScene } from 'phavuer'
 import { calculateIsometricDepth, tileToWorldX, tileToWorldY } from '@/composables/zoneComposable'
 import { loadTexture } from '@/composables/gameComposable'
-import type { AssetDataT, ZoneObject } from '@/types'
+import type { AssetDataT, ZoneObject } from '@/application/types'
 import { useGameStore } from '@/stores/gameStore'
 
 const props = defineProps<{
diff --git a/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue b/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue
index ce51563..e2d0318 100644
--- a/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue
+++ b/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script setup lang="ts">
-import type { CharacterHair, CharacterGender, Sprite } from '@/types'
+import type { CharacterHair, CharacterGender, Sprite } from '@/application/types'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useGameStore } from '@/stores/gameStore'
diff --git a/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue b/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue
index e295fb1..a40a022 100644
--- a/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue
+++ b/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue
@@ -29,7 +29,7 @@
 import { useGameStore } from '@/stores/gameStore'
 import { onMounted, ref, computed } from 'vue'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
-import type { CharacterHair } from '@/types'
+import type { CharacterHair } from '@/application/types'
 import { useVirtualList } from '@vueuse/core'
 
 const gameStore = useGameStore()
diff --git a/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue b/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue
index 142eab1..5fc511f 100644
--- a/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue
+++ b/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script setup lang="ts">
-import type { CharacterType, CharacterGender, CharacterRace, Sprite } from '@/types'
+import type { CharacterType, CharacterGender, CharacterRace, Sprite } from '@/application/types'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useGameStore } from '@/stores/gameStore'
diff --git a/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue b/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue
index cf4c0dd..ada453d 100644
--- a/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue
+++ b/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue
@@ -29,7 +29,7 @@
 import { useGameStore } from '@/stores/gameStore'
 import { onMounted, ref, computed } from 'vue'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
-import type { CharacterType } from '@/types'
+import type { CharacterType } from '@/application/types'
 import { useVirtualList } from '@vueuse/core'
 
 const gameStore = useGameStore()
diff --git a/src/components/gameMaster/assetManager/partials/item/itemDetails.vue b/src/components/gameMaster/assetManager/partials/item/itemDetails.vue
index 668c0af..3415aa0 100644
--- a/src/components/gameMaster/assetManager/partials/item/itemDetails.vue
+++ b/src/components/gameMaster/assetManager/partials/item/itemDetails.vue
@@ -44,7 +44,7 @@
 </template>
 
 <script setup lang="ts">
-import type { Item, ItemType, ItemRarity } from '@/types'
+import type { Item, ItemType, ItemRarity } from '@/application/types'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useGameStore } from '@/stores/gameStore'
diff --git a/src/components/gameMaster/assetManager/partials/item/itemList.vue b/src/components/gameMaster/assetManager/partials/item/itemList.vue
index 9b0169c..a741333 100644
--- a/src/components/gameMaster/assetManager/partials/item/itemList.vue
+++ b/src/components/gameMaster/assetManager/partials/item/itemList.vue
@@ -32,7 +32,7 @@
 import { useGameStore } from '@/stores/gameStore'
 import { onMounted, ref, computed } from 'vue'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
-import type { Item } from '@/types'
+import type { Item } from '@/application/types'
 import { useVirtualList } from '@vueuse/core'
 
 const gameStore = useGameStore()
diff --git a/src/components/gameMaster/assetManager/partials/object/ObjectDetails.vue b/src/components/gameMaster/assetManager/partials/object/ObjectDetails.vue
index 2f263b5..906fc0d 100644
--- a/src/components/gameMaster/assetManager/partials/object/ObjectDetails.vue
+++ b/src/components/gameMaster/assetManager/partials/object/ObjectDetails.vue
@@ -50,12 +50,12 @@
 </template>
 
 <script setup lang="ts">
-import type { Object } from '@/types'
+import type { Object } from '@/application/types'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import { useGameStore } from '@/stores/gameStore'
-import config from '@/config'
+import config from '@/application/config'
 import ChipsInput from '@/components/forms/ChipsInput.vue'
 
 const gameStore = useGameStore()
diff --git a/src/components/gameMaster/assetManager/partials/object/ObjectList.vue b/src/components/gameMaster/assetManager/partials/object/ObjectList.vue
index 064adda..6f42696 100644
--- a/src/components/gameMaster/assetManager/partials/object/ObjectList.vue
+++ b/src/components/gameMaster/assetManager/partials/object/ObjectList.vue
@@ -28,11 +28,11 @@
 </template>
 
 <script setup lang="ts">
-import config from '@/config'
+import config from '@/application/config'
 import { useGameStore } from '@/stores/gameStore'
 import { onMounted, ref, computed } from 'vue'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
-import type { Object } from '@/types'
+import type { Object } from '@/application/types'
 import { useVirtualList } from '@vueuse/core'
 
 const gameStore = useGameStore()
diff --git a/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue b/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue
index 5805fc7..708b55a 100644
--- a/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue
+++ b/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue
@@ -69,13 +69,13 @@
 </template>
 
 <script setup lang="ts">
-import type { Sprite, SpriteAction } from '@/types'
+import type { Sprite, SpriteAction } from '@/application/types'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useGameStore } from '@/stores/gameStore'
 import Accordion from '@/components/utilities/Accordion.vue'
 import SpriteActionsInput from '@/components/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue'
-import { uuidv4 } from '@/utilities'
+import { uuidv4 } from '@/application/utilities'
 
 const gameStore = useGameStore()
 const assetManagerStore = useAssetManagerStore()
diff --git a/src/components/gameMaster/assetManager/partials/sprite/SpriteList.vue b/src/components/gameMaster/assetManager/partials/sprite/SpriteList.vue
index 3742807..2ceb749 100644
--- a/src/components/gameMaster/assetManager/partials/sprite/SpriteList.vue
+++ b/src/components/gameMaster/assetManager/partials/sprite/SpriteList.vue
@@ -24,12 +24,12 @@
 </template>
 
 <script setup lang="ts">
-import config from '@/config'
+import config from '@/application/config'
 import { useGameStore } from '@/stores/gameStore'
 import { onMounted, ref, computed } from 'vue'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useVirtualList } from '@vueuse/core'
-import type { Sprite } from '@/types'
+import type { Sprite } from '@/application/types'
 
 const gameStore = useGameStore()
 const assetManagerStore = useAssetManagerStore()
diff --git a/src/components/gameMaster/assetManager/partials/tile/TileDetails.vue b/src/components/gameMaster/assetManager/partials/tile/TileDetails.vue
index 8211e12..0a4ca55 100644
--- a/src/components/gameMaster/assetManager/partials/tile/TileDetails.vue
+++ b/src/components/gameMaster/assetManager/partials/tile/TileDetails.vue
@@ -23,12 +23,12 @@
 </template>
 
 <script setup lang="ts">
-import type { Tile } from '@/types'
+import type { Tile } from '@/application/types'
 import { computed, onBeforeUnmount, onMounted, ref, toRaw, watch } from 'vue'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import { useGameStore } from '@/stores/gameStore'
-import config from '@/config'
+import config from '@/application/config'
 import ChipsInput from '@/components/forms/ChipsInput.vue'
 
 const gameStore = useGameStore()
diff --git a/src/components/gameMaster/assetManager/partials/tile/TileList.vue b/src/components/gameMaster/assetManager/partials/tile/TileList.vue
index 052a776..1541bc8 100644
--- a/src/components/gameMaster/assetManager/partials/tile/TileList.vue
+++ b/src/components/gameMaster/assetManager/partials/tile/TileList.vue
@@ -28,11 +28,11 @@
 </template>
 
 <script setup lang="ts">
-import config from '@/config'
+import config from '@/application/config'
 import { useGameStore } from '@/stores/gameStore'
 import { onMounted, ref, computed } from 'vue'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
-import type { Tile } from '@/types'
+import type { Tile } from '@/application/types'
 import { useVirtualList } from '@vueuse/core'
 
 const gameStore = useGameStore()
diff --git a/src/components/gameMaster/zoneEditor/ZoneEditor.vue b/src/components/gameMaster/zoneEditor/ZoneEditor.vue
index dc20f3b..ccaa53a 100644
--- a/src/components/gameMaster/zoneEditor/ZoneEditor.vue
+++ b/src/components/gameMaster/zoneEditor/ZoneEditor.vue
@@ -17,7 +17,7 @@
 import { onUnmounted, ref } from 'vue'
 import { useGameStore } from '@/stores/gameStore'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
-import { type Zone } from '@/types'
+import { type Zone } from '@/application/types'
 // Components
 import Toolbar from '@/components/gameMaster/zoneEditor/partials/Toolbar.vue'
 import TileList from '@/components/gameMaster/zoneEditor/partials/TileList.vue'
diff --git a/src/components/gameMaster/zoneEditor/partials/CreateZone.vue b/src/components/gameMaster/zoneEditor/partials/CreateZone.vue
index d9552a2..5cfdfa1 100644
--- a/src/components/gameMaster/zoneEditor/partials/CreateZone.vue
+++ b/src/components/gameMaster/zoneEditor/partials/CreateZone.vue
@@ -40,7 +40,7 @@ import { ref } from 'vue'
 import Modal from '@/components/utilities/Modal.vue'
 import { useGameStore } from '@/stores/gameStore'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
-import type { Zone } from '@/types'
+import type { Zone } from '@/application/types'
 
 const gameStore = useGameStore()
 const zoneEditorStore = useZoneEditorStore()
diff --git a/src/components/gameMaster/zoneEditor/partials/ObjectList.vue b/src/components/gameMaster/zoneEditor/partials/ObjectList.vue
index 3624422..379f94f 100644
--- a/src/components/gameMaster/zoneEditor/partials/ObjectList.vue
+++ b/src/components/gameMaster/zoneEditor/partials/ObjectList.vue
@@ -41,12 +41,12 @@
 </template>
 
 <script setup lang="ts">
-import config from '@/config'
+import config from '@/application/config'
 import { ref, onMounted, computed } from 'vue'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import { useGameStore } from '@/stores/gameStore'
 import Modal from '@/components/utilities/Modal.vue'
-import type { Object, ZoneObject } from '@/types'
+import type { Object, ZoneObject } from '@/application/types'
 
 const gameStore = useGameStore()
 const isModalOpen = ref(false)
diff --git a/src/components/gameMaster/zoneEditor/partials/SelectedZoneObject.vue b/src/components/gameMaster/zoneEditor/partials/SelectedZoneObject.vue
index d8d035f..bfd57ef 100644
--- a/src/components/gameMaster/zoneEditor/partials/SelectedZoneObject.vue
+++ b/src/components/gameMaster/zoneEditor/partials/SelectedZoneObject.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script setup lang="ts">
-import type { ZoneObject } from '@/types'
+import type { ZoneObject } from '@/application/types'
 
 const props = defineProps<{
   zoneObject: ZoneObject
diff --git a/src/components/gameMaster/zoneEditor/partials/TeleportModal.vue b/src/components/gameMaster/zoneEditor/partials/TeleportModal.vue
index c449ef6..61ff5bb 100644
--- a/src/components/gameMaster/zoneEditor/partials/TeleportModal.vue
+++ b/src/components/gameMaster/zoneEditor/partials/TeleportModal.vue
@@ -43,7 +43,7 @@ import { computed, onMounted, ref, watch } from 'vue'
 import Modal from '@/components/utilities/Modal.vue'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import { useGameStore } from '@/stores/gameStore'
-import type { Zone } from '@/types'
+import type { Zone } from '@/application/types'
 
 const showTeleportModal = computed(() => zoneEditorStore.tool === 'pencil' && zoneEditorStore.drawMode === 'teleport')
 const zoneEditorStore = useZoneEditorStore()
diff --git a/src/components/gameMaster/zoneEditor/partials/TileList.vue b/src/components/gameMaster/zoneEditor/partials/TileList.vue
index e3d33ff..6eab395 100644
--- a/src/components/gameMaster/zoneEditor/partials/TileList.vue
+++ b/src/components/gameMaster/zoneEditor/partials/TileList.vue
@@ -81,12 +81,12 @@
 </template>
 
 <script setup lang="ts">
-import config from '@/config'
+import config from '@/application/config'
 import { ref, onMounted, computed } from 'vue'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import { useGameStore } from '@/stores/gameStore'
 import Modal from '@/components/utilities/Modal.vue'
-import type { Tile } from '@/types'
+import type { Tile } from '@/application/types'
 
 const gameStore = useGameStore()
 const isModalOpen = ref(false)
diff --git a/src/components/gameMaster/zoneEditor/partials/ZoneList.vue b/src/components/gameMaster/zoneEditor/partials/ZoneList.vue
index 2d73fb6..2bc2577 100644
--- a/src/components/gameMaster/zoneEditor/partials/ZoneList.vue
+++ b/src/components/gameMaster/zoneEditor/partials/ZoneList.vue
@@ -29,7 +29,7 @@
 import { onMounted } from 'vue'
 import { useGameStore } from '@/stores/gameStore'
 import Modal from '@/components/utilities/Modal.vue'
-import type { Zone } from '@/types'
+import type { Zone } from '@/application/types'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import CreateZone from '@/components/gameMaster/zoneEditor/partials/CreateZone.vue'
 
diff --git a/src/components/gameMaster/zoneEditor/zonePartials/ZoneEventTiles.vue b/src/components/gameMaster/zoneEditor/zonePartials/ZoneEventTiles.vue
index 00ffdb8..fe130f0 100644
--- a/src/components/gameMaster/zoneEditor/zonePartials/ZoneEventTiles.vue
+++ b/src/components/gameMaster/zoneEditor/zonePartials/ZoneEventTiles.vue
@@ -3,11 +3,11 @@
 </template>
 
 <script setup lang="ts">
-import { type ZoneEventTile, ZoneEventTileType } from '@/types'
+import { type ZoneEventTile, ZoneEventTileType } from '@/application/types'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import { Image, useScene } from 'phavuer'
 import { getTile, tileToWorldX, tileToWorldY } from '@/composables/zoneComposable'
-import { uuidv4 } from '@/utilities'
+import { uuidv4 } from '@/application/utilities'
 import { onMounted, onUnmounted } from 'vue'
 
 const scene = useScene()
diff --git a/src/components/gameMaster/zoneEditor/zonePartials/ZoneObject.vue b/src/components/gameMaster/zoneEditor/zonePartials/ZoneObject.vue
index 43ad2e7..eca55e6 100644
--- a/src/components/gameMaster/zoneEditor/zonePartials/ZoneObject.vue
+++ b/src/components/gameMaster/zoneEditor/zonePartials/ZoneObject.vue
@@ -7,7 +7,7 @@ import { computed } from 'vue'
 import { Image, useScene } from 'phavuer'
 import { calculateIsometricDepth, tileToWorldX, tileToWorldY } from '@/composables/zoneComposable'
 import { loadTexture } from '@/composables/gameComposable'
-import type { AssetDataT, ZoneObject } from '@/types'
+import type { AssetDataT, ZoneObject } from '@/application/types'
 import { useGameStore } from '@/stores/gameStore'
 
 const props = defineProps<{
diff --git a/src/components/gameMaster/zoneEditor/zonePartials/ZoneObjects.vue b/src/components/gameMaster/zoneEditor/zonePartials/ZoneObjects.vue
index b93cab7..f3afd30 100644
--- a/src/components/gameMaster/zoneEditor/zonePartials/ZoneObjects.vue
+++ b/src/components/gameMaster/zoneEditor/zonePartials/ZoneObjects.vue
@@ -4,14 +4,14 @@
 </template>
 
 <script setup lang="ts">
-import { uuidv4 } from '@/utilities'
+import { uuidv4 } from '@/application/utilities'
 import { getTile } from '@/composables/zoneComposable'
 import { useScene } from 'phavuer'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import SelectedZoneObject from '@/components/gameMaster/zoneEditor/partials/SelectedZoneObject.vue'
 import { onMounted, onUnmounted, ref, watch } from 'vue'
 import ZoneObject from '@/components/gameMaster/zoneEditor/zonePartials/ZoneObject.vue'
-import type { ZoneObject as ZoneObjectT } from '@/types'
+import type { ZoneObject as ZoneObjectT } from '@/application/types'
 
 const scene = useScene()
 const zoneEditorStore = useZoneEditorStore()
diff --git a/src/components/gameMaster/zoneEditor/zonePartials/ZoneTiles.vue b/src/components/gameMaster/zoneEditor/zonePartials/ZoneTiles.vue
index d2dbf34..9ae49de 100644
--- a/src/components/gameMaster/zoneEditor/zonePartials/ZoneTiles.vue
+++ b/src/components/gameMaster/zoneEditor/zonePartials/ZoneTiles.vue
@@ -3,14 +3,14 @@
 </template>
 
 <script setup lang="ts">
-import config from '@/config'
+import config from '@/application/config'
 import { useScene } from 'phavuer'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import { onMounted, onUnmounted, watch } from 'vue'
 import { createTileArray, getTile, placeTile, setLayerTiles } from '@/composables/zoneComposable'
 import Controls from '@/components/utilities/Controls.vue'
 import { useGameStore } from '@/stores/gameStore'
-import type { AssetDataT } from '@/types'
+import type { AssetDataT } from '@/application/types'
 
 const emit = defineEmits(['tileMap:create'])
 
diff --git a/src/components/gui/Chat.vue b/src/components/gui/Chat.vue
index 5cb1bfb..6ee0a80 100644
--- a/src/components/gui/Chat.vue
+++ b/src/components/gui/Chat.vue
@@ -24,7 +24,7 @@
 import { onBeforeUnmount, ref, nextTick, onMounted } from 'vue'
 import { onClickOutside, useFocus } from '@vueuse/core'
 import { useGameStore } from '@/stores/gameStore'
-import type { Chat } from '@/types'
+import type { Chat } from '@/application/types'
 import { useZoneStore } from '@/stores/zoneStore'
 import { useScene } from 'phavuer'
 
diff --git a/src/components/screens/Characters.vue b/src/components/screens/Characters.vue
index ede7bf6..dd8c052 100644
--- a/src/components/screens/Characters.vue
+++ b/src/components/screens/Characters.vue
@@ -143,11 +143,11 @@
 </template>
 
 <script setup lang="ts">
-import config from '@/config'
+import config from '@/application/config'
 import { useGameStore } from '@/stores/gameStore'
 import { onBeforeUnmount, ref, watch } from 'vue'
 import Modal from '@/components/utilities/Modal.vue'
-import { type Character as CharacterT, type CharacterHair } from '@/types'
+import { type Character as CharacterT, type CharacterHair } from '@/application/types'
 import ConfirmationModal from '@/components/utilities/ConfirmationModal.vue'
 
 const gameStore = useGameStore()
diff --git a/src/components/screens/Game.vue b/src/components/screens/Game.vue
index 844a938..2b44290 100644
--- a/src/components/screens/Game.vue
+++ b/src/components/screens/Game.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script setup lang="ts">
-import config from '@/config'
+import config from '@/application/config'
 import 'phaser'
 import { Game, Scene } from 'phavuer'
 import { useGameStore } from '@/stores/gameStore'
diff --git a/src/components/screens/ZoneEditor.vue b/src/components/screens/ZoneEditor.vue
index 2d0b1d4..7641bb4 100644
--- a/src/components/screens/ZoneEditor.vue
+++ b/src/components/screens/ZoneEditor.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script setup lang="ts">
-import config from '@/config'
+import config from '@/application/config'
 import 'phaser'
 import { Game, Scene } from 'phavuer'
 import { useGameStore } from '@/stores/gameStore'
@@ -17,7 +17,7 @@ import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import ZoneEditor from '@/components/gameMaster/zoneEditor/ZoneEditor.vue'
 import AwaitLoaderPlugin from 'phaser3-rex-plugins/plugins/awaitloader-plugin'
 import { loadTexture } from '@/composables/gameComposable'
-import type { AssetDataT } from '@/types'
+import type { AssetDataT } from '@/application/types'
 
 const gameStore = useGameStore()
 const zoneEditorStore = useZoneEditorStore()
diff --git a/src/composables/gameComposable.ts b/src/composables/gameComposable.ts
index a17cdb9..de51969 100644
--- a/src/composables/gameComposable.ts
+++ b/src/composables/gameComposable.ts
@@ -1,7 +1,7 @@
-import type { AssetDataT, Sprite } from '@/types'
+import type { AssetDataT, Sprite } from '@/application/types'
 import { useGameStore } from '@/stores/gameStore'
 import { AssetStorage } from '@/storage/assetStorage'
-import config from '@/config'
+import config from '@/application/config'
 
 const textureLoadingPromises = new Map<string, Promise<boolean>>()
 
diff --git a/src/composables/pointerHandlers/useGamePointerHandlers.ts b/src/composables/pointerHandlers/useGamePointerHandlers.ts
index 2e90413..10f3ed2 100644
--- a/src/composables/pointerHandlers/useGamePointerHandlers.ts
+++ b/src/composables/pointerHandlers/useGamePointerHandlers.ts
@@ -1,7 +1,7 @@
 import { type Ref, ref } from 'vue'
 import { getTile, tileToWorldXY } from '@/composables/zoneComposable'
 import { useGameStore } from '@/stores/gameStore'
-import config from '@/config'
+import config from '@/application/config'
 
 export function useGamePointerHandlers(scene: Phaser.Scene, layer: Phaser.Tilemaps.TilemapLayer, waypoint: Ref<{ visible: boolean; x: number; y: number }>, camera: Phaser.Cameras.Scene2D.Camera) {
   const gameStore = useGameStore()
diff --git a/src/composables/pointerHandlers/useZoneEditorPointerHandlers.ts b/src/composables/pointerHandlers/useZoneEditorPointerHandlers.ts
index ca4ed28..c621259 100644
--- a/src/composables/pointerHandlers/useZoneEditorPointerHandlers.ts
+++ b/src/composables/pointerHandlers/useZoneEditorPointerHandlers.ts
@@ -2,7 +2,7 @@ import { computed, type Ref } from 'vue'
 import { getTile, tileToWorldXY } from '@/composables/zoneComposable'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import { useGameStore } from '@/stores/gameStore'
-import config from '@/config'
+import config from '@/application/config'
 
 export function useZoneEditorPointerHandlers(scene: Phaser.Scene, layer: Phaser.Tilemaps.TilemapLayer, waypoint: Ref<{ visible: boolean; x: number; y: number }>, camera: Phaser.Cameras.Scene2D.Camera) {
   const gameStore = useGameStore()
diff --git a/src/composables/zoneComposable.ts b/src/composables/zoneComposable.ts
index bbec672..c033397 100644
--- a/src/composables/zoneComposable.ts
+++ b/src/composables/zoneComposable.ts
@@ -1,9 +1,9 @@
-import config from '@/config'
+import config from '@/application/config'
 import Tilemap = Phaser.Tilemaps.Tilemap
 import TilemapLayer = Phaser.Tilemaps.TilemapLayer
 import Tileset = Phaser.Tilemaps.Tileset
 import Tile = Phaser.Tilemaps.Tile
-import type { AssetDataT, Zone as ZoneT } from '@/types'
+import type { AssetDataT, Zone as ZoneT } from '@/application/types'
 import { loadTexture } from '@/composables/gameComposable'
 
 export function getTile(layer: TilemapLayer | Tilemap, x: number, y: number): Tile | undefined {
diff --git a/src/services/authentication.ts b/src/services/authentication.ts
index a12c37f..2ed37a7 100644
--- a/src/services/authentication.ts
+++ b/src/services/authentication.ts
@@ -1,7 +1,7 @@
 import axios from 'axios'
-import config from '@/config'
+import config from '@/application/config'
 import { useCookies } from '@vueuse/integrations/useCookies'
-import { getDomain } from '@/utilities'
+import { getDomain } from '@/application/utilities'
 
 export async function register(username: string, email: string, password: string) {
   try {
diff --git a/src/storage/assetStorage.ts b/src/storage/assetStorage.ts
index 516b24a..6733d92 100644
--- a/src/storage/assetStorage.ts
+++ b/src/storage/assetStorage.ts
@@ -1,6 +1,6 @@
-import config from '@/config'
+import config from '@/application/config'
 import Dexie from 'dexie'
-import type { AssetDataT } from '@/types'
+import type { AssetDataT } from '@/application/types'
 
 export class AssetStorage {
   private db: Dexie
diff --git a/src/stores/assetManagerStore.ts b/src/stores/assetManagerStore.ts
index ed5a8f3..b665f13 100644
--- a/src/stores/assetManagerStore.ts
+++ b/src/stores/assetManagerStore.ts
@@ -1,6 +1,6 @@
 import { ref } from 'vue'
 import { defineStore } from 'pinia'
-import type { Tile, Object, Sprite, CharacterType, CharacterHair, Item } from '@/types'
+import type { Tile, Object, Sprite, CharacterType, CharacterHair, Item } from '@/application/types'
 
 export const useAssetManagerStore = defineStore('assetManager', () => {
   const tileList = ref<Tile[]>([])
diff --git a/src/stores/gameStore.ts b/src/stores/gameStore.ts
index ae2439a..9da2354 100644
--- a/src/stores/gameStore.ts
+++ b/src/stores/gameStore.ts
@@ -1,9 +1,9 @@
 import { defineStore } from 'pinia'
 import { io, Socket } from 'socket.io-client'
-import type { AssetDataT, Character, Notification, User, WorldSettings } from '@/types'
-import config from '@/config'
+import type { AssetDataT, Character, Notification, User, WorldSettings } from '@/application/types'
+import config from '@/application/config'
 import { useCookies } from '@vueuse/integrations/useCookies'
-import { getDomain } from '@/utilities'
+import { getDomain } from '@/application/utilities'
 
 export const useGameStore = defineStore('game', {
   state: () => {
diff --git a/src/stores/zoneEditorStore.ts b/src/stores/zoneEditorStore.ts
index 6d4e949..133497a 100644
--- a/src/stores/zoneEditorStore.ts
+++ b/src/stores/zoneEditorStore.ts
@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia'
 import { useGameStore } from '@/stores/gameStore'
-import type { Zone, Object, Tile, ZoneEffect, ZoneObject } from '@/types'
+import type { Zone, Object, Tile, ZoneEffect, ZoneObject } from '@/application/types'
 
 export type TeleportSettings = {
   toZoneId: number
diff --git a/src/stores/zoneStore.ts b/src/stores/zoneStore.ts
index 0d4bd36..67552e7 100644
--- a/src/stores/zoneStore.ts
+++ b/src/stores/zoneStore.ts
@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia'
-import type { ZoneCharacter, Zone } from '@/types'
+import type { ZoneCharacter, Zone } from '@/application/types'
 
 export const useZoneStore = defineStore('zone', {
   state: () => {
@@ -40,6 +40,15 @@ export const useZoneStore = defineStore('zone', {
     setCharacterLoaded(loaded: boolean) {
       this.characterLoaded = loaded
     },
+    updateCharacterPosition(data: { id: number, positionX: number, positionY: number, rotation: number, isMoving: boolean }) {
+      const character = this.characters.find(char => char.character.id === data.id)
+      if (character) {
+        character.character.positionX= data.positionX
+        character.character.positionY = data.positionY
+        character.character.rotation = data.rotation
+        character.isMoving = data.isMoving
+      }
+    },
     reset() {
       this.zone = null
       this.characters = []