nginx.conf

@@ -0,0 +1,16 @@
+server {
+    listen 80;
+    server_name localhost;
+    root /usr/share/nginx/html;
+    index index.html;
+
+    # Redirect example
+    location /discord {
+        return 301 https://discord.gg/JTev3nzeDa;
+    }
+
+    # Serve static files
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+}

package.json

@@ -16,22 +16,17 @@
   "dependencies": {
     "@vueuse/core": "^10.5.0",
     "@vueuse/integrations": "^10.5.0",
-    "axios": "^1.7.9",
+    "axios": "^1.7.7",
-    "dexie": "^4.0.11",
+    "dexie": "^4.0.8",
-    "phaser": "^3.88.2",
+    "phaser": "^3.86.0",
-    "phaser3-rex-plugins": "^1.80.13",
+    "pinia": "^2.1.6",
-    "phavuer": "^0.16.5",
+    "socket.io-client": "^4.8.0",
-    "pinia": "^2.3.1",
-    "sharp": "^0.33.5",
-    "socket.io-client": "^4.8.1",
     "universal-cookie": "^6.1.3",
-    "vite-plugin-image-optimizer": "^1.1.8",
+    "vue": "^3.5.12",
-    "vue": "^3.5.13",
+    "zod": "^3.22.2"
-    "zod": "^3.24.2"
   },
   "devDependencies": {
     "@ianvs/prettier-plugin-sort-imports": "^4.4.0",
-    "@tauri-apps/cli": "^2.2.7",
     "@tsconfig/node20": "^20.1.4",
     "@types/jsdom": "^21.1.7",
     "@types/node": "^20.14.11",
@@ -41,6 +36,8 @@
     "autoprefixer": "^10.4.19",
     "jsdom": "^24.1.1",
     "npm-run-all2": "^6.2.3",
+    "phaser3-rex-plugins": "^1.80.8",
+    "phavuer": "^0.16.1",
     "postcss": "^8.4.47",
     "prettier": "^3.3.3",
     "sass": "^1.79.4",

src-tauri/.gitignore

@@ -1,4 +0,0 @@
-# Generated by Cargo
-# will have compiled files and executables
-/target/
-/gen/schemas

src-tauri/Cargo.toml

@@ -1,25 +0,0 @@
-[package]
-name = "app"
-version = "0.1.0"
-description = "A Tauri App"
-authors = ["you"]
-license = ""
-repository = ""
-edition = "2021"
-rust-version = "1.77.2"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[lib]
-name = "app_lib"
-crate-type = ["staticlib", "cdylib", "rlib"]
-
-[build-dependencies]
-tauri-build = { version = "2.0.4", features = [] }
-
-[dependencies]
-serde_json = "1.0"
-serde = { version = "1.0", features = ["derive"] }
-log = "0.4"
-tauri = { version = "2.2.4", features = [] }
-tauri-plugin-log = "2.0.0-rc"

src-tauri/build.rs

@@ -1,3 +0,0 @@
-fn main() {
-  tauri_build::build()
-}

src-tauri/capabilities/default.json

@@ -1,11 +0,0 @@
-{
-  "$schema": "../gen/schemas/desktop-schema.json",
-  "identifier": "default",
-  "description": "enables the default permissions",
-  "windows": [
-    "main"
-  ],
-  "permissions": [
-    "core:default"
-  ]
-}

src-tauri/src/lib.rs

@@ -1,16 +0,0 @@
-#[cfg_attr(mobile, tauri::mobile_entry_point)]
-pub fn run() {
-  tauri::Builder::default()
-    .setup(|app| {
-      if cfg!(debug_assertions) {
-        app.handle().plugin(
-          tauri_plugin_log::Builder::default()
-            .level(log::LevelFilter::Info)
-            .build(),
-        )?;
-      }
-      Ok(())
-    })
-    .run(tauri::generate_context!())
-    .expect("error while running tauri application");
-}

src-tauri/src/main.rs

@@ -1,6 +0,0 @@
-// Prevents additional console window on Windows in release, DO NOT REMOVE!!
-#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
-
-fn main() {
-  app_lib::run();
-}

src-tauri/tauri.conf.json

@@ -1,37 +0,0 @@
-{
-  "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
-  "productName": "noxious",
-  "version": "0.1.0",
-  "identifier": "com.noxious.app",
-  "build": {
-    "frontendDist": "../dist",
-    "devUrl": "http://localhost:5173",
-    "beforeDevCommand": "npm run dev",
-    "beforeBuildCommand": "npm run build-only"
-  },
-  "app": {
-    "windows": [
-      {
-        "title": "Noxious",
-        "width": 800,
-        "height": 600,
-        "resizable": true,
-        "fullscreen": false
-      }
-    ],
-    "security": {
-      "csp": null
-    }
-  },
-  "bundle": {
-    "active": true,
-    "targets": "all",
-    "icon": [
-      "icons/32x32.png",
-      "icons/128x128.png",
-      "icons/128x128@2x.png",
-      "icons/icon.icns",
-      "icons/icon.ico"
-    ]
-  }
-}

src/App.vue

@@ -1,6 +1,7 @@
 <template>
   <Debug />
   <Notifications />
+  <BackgroundImageLoader />
   <GmPanel v-if="gameStore.character?.role === 'gm'" />
   <component :is="currentScreen" />
 </template>
@@ -12,11 +13,11 @@ import Game from '@/components/screens/Game.vue'
 import Loading from '@/components/screens/Loading.vue'
 import Login from '@/components/screens/Login.vue'
 import MapEditor from '@/components/screens/MapEditor.vue'
+import BackgroundImageLoader from '@/components/utilities/BackgroundImageLoader.vue'
 import Debug from '@/components/utilities/Debug.vue'
 import Notifications from '@/components/utilities/Notifications.vue'
 import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
 import { useSoundComposable } from '@/composables/useSoundComposable'
-import { socketManager } from '@/managers/SocketManager'
 import { useGameStore } from '@/stores/gameStore'
 import { computed, watch } from 'vue'
 
@@ -27,8 +28,8 @@ const { playSound } = useSoundComposable()
 
 const currentScreen = computed(() => {
   if (!gameStore.game.isLoaded) return Loading
-  if (!socketManager.connection) return Login
+  if (!gameStore.connection) return Login
-  if (!socketManager.token) return Login
+  if (!gameStore.token) return Login
   if (!gameStore.character) return Characters
   if (mapEditor.active.value) return MapEditor
   return Game

src/application/enums.ts

@@ -3,61 +3,3 @@ export enum Direction {
   NEGATIVE,
   UNCHANGED
 }
-
-export enum SocketEvent {
-  CONNECT_ERROR = 'connect_error',
-  RECONNECT_FAILED = 'reconnect_failed',
-  CLOSE = '52',
-  DATA = '51',
-  CHARACTER_CONNECT = '50',
-  CHARACTER_CREATE = '49',
-  CHARACTER_DELETE = '48',
-  CHARACTER_LIST = '47',
-  GM_CHARACTERHAIR_CREATE = '46',
-  GM_CHARACTERHAIR_REMOVE = '45',
-  GM_CHARACTERHAIR_LIST = '44',
-  GM_CHARACTERHAIR_UPDATE = '43',
-  GM_CHARACTERTYPE_CREATE = '42',
-  GM_CHARACTERTYPE_REMOVE = '41',
-  GM_CHARACTERTYPE_LIST = '40',
-  GM_CHARACTERTYPE_UPDATE = '39',
-  GM_ITEM_CREATE = '38',
-  GM_ITEM_REMOVE = '37',
-  GM_ITEM_LIST = '36',
-  GM_ITEM_UPDATE = '35',
-  GM_MAPOBJECT_LIST = '34',
-  GM_MAPOBJECT_REMOVE = '33',
-  GM_MAPOBJECT_UPDATE = '32',
-  GM_MAPOBJECT_UPLOAD = '31',
-  GM_SPRITE_COPY = '30',
-  GM_SPRITE_CREATE = '29',
-  GM_SPRITE_DELETE = '28',
-  GM_SPRITE_LIST = '27',
-  GM_SPRITE_UPDATE = '26',
-  GM_TILE_DELETE = '25',
-  GM_TILE_LIST = '24',
-  GM_TILE_UPDATE = '23',
-  GM_TILE_UPLOAD = '22',
-  GM_MAP_CREATE = '21',
-  GM_MAP_DELETE = '20',
-  GM_MAP_REQUEST = '19',
-  GM_MAP_UPDATE = '18',
-  MAP_CHARACTER_MOVEERROR = '17',
-  DISCONNECT = 'disconnect',
-  USER_DISCONNECT = '15',
-  LOGIN = '14',
-  LOGGED_IN = '13',
-  NOTIFICATION = '12',
-  DATE = '11',
-  FAILED = '10',
-  COMPLETED = '9',
-  CONNECTION = 'connection',
-  WEATHER = '7',
-  CHARACTER_DISCONNECT = '6',
-  MAP_CHARACTER_ATTACK = '5',
-  MAP_CHARACTER_TELEPORT = '4',
-  MAP_CHARACTER_JOIN = '3',
-  MAP_CHARACTER_LEAVE = '2',
-  MAP_CHARACTER_MOVE = '1',
-  CHAT_MESSAGE = '0'
-}

src/application/types.ts

@@ -36,8 +36,7 @@ export type Tile = {
 export type MapObject = {
   id: string
   name: string
-  tags: string[]
+  tags: any | null
-  depthOffsets: number[]
   originX: number
   originY: number
   frameRate: number
@@ -101,7 +100,7 @@ export enum MapEventTileType {
 
 export type MapEventTile = {
   id: string
-  map: string
+  mapid: string
   type: MapEventTileType
   positionX: number
   positionY: number
@@ -151,9 +150,8 @@ export type CharacterType = {
 export type CharacterHair = {
   id: string
   name: string
-  sprite: string | Sprite
+  sprite?: Sprite
   gender: CharacterGender
-  color: string
   isSelectable: boolean
 }
 
@@ -210,8 +208,6 @@ export enum CharacterEquipmentSlotType {
 export type Sprite = {
   id: string
   name: string
-  width: number | null
-  height: number | null
   createdAt: Date
   updatedAt: Date
   spriteActions: SpriteAction[]

src/application/utilities.ts

@@ -21,17 +21,7 @@ export async function downloadCache<T extends { id: string; updatedAt: Date }>(e
   }
 
   const items = response.data ?? []
-  const serverItemIds = new Set(items.map((item) => item.id))
 
-  // Remove items that don't exist on server
-  const existingItems = await storage.getAll()
-  for (const existingItem of existingItems) {
-    if (!serverItemIds.has(existingItem.id)) {
-      await storage.delete(existingItem.id)
-    }
-  }
-
-  // Update or add new items
   for (const item of items) {
     let overwrite = false
     const existingItem = await storage.getById(item.id)

src/assets/scss/main.scss

@@ -124,7 +124,7 @@ button {
 
     &.active,
     &:hover {
-      @apply bg-red-500;
+      @apply bg-red-400;
     }
   }
 

src/components/game/character/Character.vue

@@ -2,8 +2,8 @@
   <Container ref="characterContainer" :x="currentPositionX" :y="currentPositionY" :depth="isometricDepth">
     <ChatBubble :mapCharacter="props.mapCharacter" />
     <HealthBar :mapCharacter="props.mapCharacter" />
-    <CharacterHair :mapCharacter="props.mapCharacter" :flipX="isFlippedX" />
+    <CharacterHair :mapCharacter="props.mapCharacter" />
-    <Sprite ref="characterSprite" :flipX="isFlippedX" />
+    <Sprite ref="characterSprite" :origin-y="1" :flipX="isFlippedX" />
   </Container>
 </template>
 
@@ -28,7 +28,7 @@ const gameStore = useGameStore()
 const mapStore = useMapStore()
 const scene = useScene()
 
-const { characterContainer, characterSprite, currentPositionX, currentPositionY, isometricDepth, isFlippedX, updatePosition, playAnimation, updateSprite, initializeSprite, cleanup } = useCharacterSpriteComposable(scene, props.tileMap, props.mapCharacter)
+const { characterContainer, characterSprite, currentPositionX, currentPositionY, isometricDepth, isFlippedX, updatePosition, playAnimation, calcDirection, updateSprite, initializeSprite, cleanup } = useCharacterSpriteComposable(scene, props.tileMap, props.mapCharacter)
 const { playSound, stopSound } = useSoundComposable()
 
 const handlePositionUpdate = (newValues: any, oldValues: any) => {
@@ -84,15 +84,15 @@ watch(
     rotation: props.mapCharacter.character.rotation,
     isAttacking: props.mapCharacter.isAttacking
   }),
-  async (oldValues, newValues) => {
+  (oldValues, newValues) => {
     handlePositionUpdate(oldValues, newValues)
   }
 )
 
 onMounted(async () => {
   await initializeSprite()
-
   if (props.mapCharacter.character.id === gameStore.character!.id) {
+    mapStore.setCharacterLoaded(true)
     scene.cameras.main.startFollow(characterContainer.value as Phaser.GameObjects.Container)
   }
 })

src/components/game/character/partials/CharacterChest.vue

@@ -0,0 +1,51 @@
+<template>
+  <Image v-bind="imageProps" v-if="gameStore.getLoadedAsset(texture)" />
+</template>
+
+<script lang="ts" setup>
+import type { MapCharacter, Sprite as SpriteT } from '@/application/types'
+import { loadSpriteTextures } from '@/services/textureService'
+import { useGameStore } from '@/stores/gameStore'
+import { Image, useScene } from 'phavuer'
+import { computed } from 'vue'
+
+const props = defineProps<{
+  mapCharacter: MapCharacter
+  currentX: number
+  currentY: number
+}>()
+
+const gameStore = useGameStore()
+const scene = useScene()
+
+const texture = computed(() => {
+  const { rotation, characterHair } = props.mapCharacter.character
+  const spriteId = characterHair?.sprite?.id
+  const direction = [0, 6].includes(rotation) ? 'back' : 'front'
+
+  return `${spriteId}-${direction}`
+})
+
+const isFlippedX = computed(() => [6, 4].includes(props.mapCharacter.character.rotation ?? 0))
+
+const imageProps = computed(() => {
+  // Get the current sprite action based on direction
+  const direction = [0, 6].includes(props.mapCharacter.character.rotation ?? 0) ? 'back' : 'front'
+  const spriteAction = props.mapCharacter.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.mapCharacter.isMoving ? Math.floor(Date.now() / 250) % 2 : 0
+  }
+})
+
+loadSpriteTextures(scene, props.mapCharacter.character.characterHair?.sprite as SpriteT)
+  .then(() => {})
+  .catch((error) => {
+    console.error('Error loading texture:', error)
+  })
+</script>

src/components/game/character/partials/CharacterHair.vue

@@ -1,63 +1,54 @@
 <template>
-  <Image ref="image" v-if="hairSpriteId" />
+  <Image v-bind="imageProps" v-if="gameStore.isTextureLoaded(texture)" />
 </template>
 
 <script lang="ts" setup>
 import type { MapCharacter, Sprite as SpriteT } from '@/application/types'
 import { loadSpriteTextures } from '@/services/textureService'
 import { CharacterHairStorage, CharacterTypeStorage, SpriteStorage } from '@/storage/storages'
-import { Image, refObj, useScene } from 'phavuer'
+import { useGameStore } from '@/stores/gameStore'
-import { computed, onMounted, ref, watch } from 'vue'
+import { Image, useScene } from 'phavuer'
+import { computed, onMounted, ref } from 'vue'
 
 const props = defineProps<{
   mapCharacter: MapCharacter
 }>()
 
+const gameStore = useGameStore()
 const scene = useScene()
 const hairSpriteId = ref('')
-const hairSprite = ref<SpriteT | null>(null)
+const sprite = ref<SpriteT | null>(null)
-const characterSpriteHeight = ref(0)
-const image = refObj<Phaser.GameObjects.Image>()
 
-const flipX = computed(() => [6, 0].includes(props.mapCharacter.character.rotation ?? 0))
 const texture = computed(() => {
-  const direction = flipX.value ? 'back' : 'front'
+  const { rotation } = props.mapCharacter.character
+  const direction = [0, 6].includes(rotation) ? 'back' : 'front'
 
   return `${hairSpriteId.value}-${direction}`
 })
 
-watch(
+const isFlippedX = computed(() => [6, 4].includes(props.mapCharacter.character.rotation ?? 0))
-  () => props.mapCharacter.character,
+
-  (newValue) => {
+const imageProps = computed(() => {
-    if (!image.value) return
+  const direction = [0, 6].includes(props.mapCharacter.character.rotation ?? 0) ? 'back' : 'front'
-    image.value.setTexture(texture.value)
+  const spriteAction = sprite.value?.spriteActions?.find((spriteAction) => spriteAction.action === direction)
-  },
+
-  { deep: true }
+  return {
-)
+    depth: 9999,
+    originX: Number(spriteAction?.originX) ?? 0,
+    originY: Number(spriteAction?.originY) ?? 0,
+    flipX: isFlippedX.value,
+    texture: texture.value
+  }
+})
 
 onMounted(async () => {
-  if (!props.mapCharacter.character.characterType || !props.mapCharacter.character.characterHair) return
-
-  const characterTypeStorage = new CharacterTypeStorage()
   const characterHairStorage = new CharacterHairStorage()
+  const spriteId = await characterHairStorage.getSpriteId(props.mapCharacter.character.characterHair!)
+  if (!spriteId) return
+
+  hairSpriteId.value = spriteId
   const spriteStorage = new SpriteStorage()
-
+  sprite.value = await spriteStorage.getById(spriteId)
-  const characterType = await characterTypeStorage.getById(props.mapCharacter.character.characterType!)
+  await loadSpriteTextures(scene, spriteId)
-  if (!characterType) return
-  characterSpriteHeight.value = 100
-
-  hairSpriteId.value = await characterHairStorage.getSpriteId(props.mapCharacter.character.characterHair)
-  if (!hairSpriteId.value) return
-
-  hairSprite.value = await spriteStorage.getById(hairSpriteId.value)
-  if (!hairSprite.value) return
-
-  await loadSpriteTextures(scene, hairSpriteId.value)
-
-  if (!image.value) return
-
-  image.value.setOrigin(0.5, 2.15)
-  image.value.setTexture(texture.value)
-  image.value.setSize(30, 40)
 })
 </script>

src/components/game/character/partials/ChatBubble.vue

@@ -1,5 +1,5 @@
 <template>
-  <Container ref="characterChatContainer">
+  <Container ref="characterChatContainer" :depth="999">
     <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>

src/components/game/gui/Chat.vue

@@ -2,7 +2,7 @@
   <div class="w-full md:min-w-[350px] max-w-[750px] flex flex-col absolute left-1/2 -translate-x-1/2 bottom-5">
     <div ref="chatWindow" class="w-full overflow-auto h-32 mb-5 bg-gray rounded-md border-2 border-solid border-gray-500 text-gray-300" v-show="gameStore.uiSettings.isChatOpen">
       <div v-for="message in chats" class="flex-col py-2 items-center p-3">
-        <span class="text-ellipsis overflow-hidden whitespace-nowrap text-sm" :class="{ 'text-cyan-300': gameStore.character?.role == 'gm' }">{{ message.character }}</span>
+        <span class="text-ellipsis overflow-hidden whitespace-nowrap text-sm" :class="{ 'text-cyan-300': gameStore.character?.role == 'gm' }">{{ message.character.name }}</span>
         <p class="text-gray-50 m-0">{{ message.message }}</p>
       </div>
     </div>
@@ -21,8 +21,7 @@
 </template>
 
 <script setup lang="ts">
-import { SocketEvent } from '@/application/enums'
+import type { Chat } from '@/application/types'
-import { socketManager } from '@/managers/SocketManager'
 import { useGameStore } from '@/stores/gameStore'
 import { useMapStore } from '@/stores/mapStore'
 import { onClickOutside, useFocus } from '@vueuse/core'
@@ -31,9 +30,10 @@ import { nextTick, onBeforeUnmount, onMounted, ref } from 'vue'
 
 const scene = useScene()
 const gameStore = useGameStore()
+const mapStore = useMapStore()
 
 const message = ref('')
-const chats = ref<{ character: string; message: string }[]>([])
+const chats = ref([] as Chat[])
 const chatWindow = ref<HTMLElement | null>(null)
 const chatInput = ref<HTMLElement | null>(null)
 
@@ -55,7 +55,7 @@ function unfocusChat(event: Event, targetElement: HTMLElement) {
 
 const sendMessage = () => {
   if (!message.value.trim()) return
-  socketManager.emit(SocketEvent.CHAT_MESSAGE, { message: message.value }, (response: boolean) => {})
+  gameStore.connection?.emit('chat:message', { message: message.value }, (response: boolean) => {})
   message.value = ''
 }
 
@@ -79,30 +79,21 @@ const scrollToBottom = () => {
   })
 }
 
-socketManager.on(SocketEvent.CHAT_MESSAGE, (data: { character: string; message: string }) => {
+gameStore.connection?.on('chat:message', (data: Chat) => {
-  if (!data.character || !data.message) return
+  chats.value.push(data)
-
-  chats.value.push({ character: data.character, message: data.message })
   scrollToBottom()
 
-  const characterContainer = scene.children.getByName(data.character) as Phaser.GameObjects.Container
+  if (!mapStore.characterLoaded) return
-  if (!characterContainer) {
-    console.log('No character container found')
-    return
-  }
 
-  const characterChatContainer = characterContainer.getByName(data.character + '_chatContainer') as Phaser.GameObjects.Container
+  const characterContainer = scene.children.getByName(data.character.name) as Phaser.GameObjects.Container
-  if (!characterChatContainer) {
+  if (!characterContainer) return
-    console.log('No character chat container found')
-    return
-  }
 
-  const chatBubble = characterChatContainer.getByName(data.character + '_chatBubble') as Phaser.GameObjects.Container
+  const characterChatContainer = characterContainer.getByName(data.character.name + '_chatContainer') as Phaser.GameObjects.Container
-  const chatText = characterChatContainer.getByName(data.character + '_chatText') as Phaser.GameObjects.Text
+  if (!characterChatContainer) return
-  if (!chatText || !chatBubble) {
+
-    console.log('No chat text or bubble found')
+  const chatBubble = characterChatContainer.getByName(data.character.name + '_chatBubble') as Phaser.GameObjects.Container
-    return
+  const chatText = characterChatContainer.getByName(data.character.name + '_chatText') as Phaser.GameObjects.Text
-  }
+  if (!chatText || !chatBubble) return
 
   function calculateTextWidth(text: string, font: string, fontSize: number): number {
     // Create a canvas element
@@ -153,7 +144,7 @@ onMounted(() => {
 })
 
 onBeforeUnmount(() => {
-  socketManager.off(SocketEvent.CHAT_MESSAGE)
+  gameStore.connection?.off('chat:message')
   removeEventListener('keydown', focusChat)
 })
 </script>

src/components/game/gui/Clock.vue

@@ -1,21 +1,21 @@
 <template>
-  <div class="absolute top-0 right-4 hidden lg:block" v-if="gameStore.world.date && typeof gameStore.world.date === 'object'">
+  <div class="absolute top-0 right-4 hidden lg:block">
-    <p class="text-white text-lg">
+    <p class="text-white text-lg">{{ gameStore.world.date.toLocaleString() }}</p>
-      {{ useDateFormat(gameStore.world.date, 'YYYY/MM/DD HH:mm') }}
-    </p>
   </div>
 </template>
 
 <script setup lang="ts">
-import { SocketEvent } from '@/application/enums'
-import { socketManager } from '@/managers/SocketManager'
 import { useGameStore } from '@/stores/gameStore'
-import { useDateFormat } from '@vueuse/core'
 import { onUnmounted } from 'vue'
 
 const gameStore = useGameStore()
 
+// Listen for new date from socket
+gameStore.connection?.on('date', (data: Date) => {
+  gameStore.world.date = new Date(data)
+})
+
 onUnmounted(() => {
-  socketManager.off(SocketEvent.DATE)
+  gameStore.connection?.off('date')
 })
 </script>

src/components/game/map/Characters.vue

@@ -3,10 +3,8 @@
 </template>
 
 <script setup lang="ts">
-import { SocketEvent } from '@/application/enums'
 import type { MapCharacter, UUID } from '@/application/types'
 import Character from '@/components/game/character/Character.vue'
-import { socketManager } from '@/managers/SocketManager'
 import { useGameStore } from '@/stores/gameStore'
 import { useMapStore } from '@/stores/mapStore'
 import { onUnmounted } from 'vue'
@@ -18,32 +16,31 @@ const props = defineProps<{
   tileMap: Phaser.Tilemaps.Tilemap
 }>()
 
-socketManager.on(SocketEvent.MAP_CHARACTER_JOIN, (data: MapCharacter) => {
+gameStore.connection?.on('map:character:join', async (data: MapCharacter) => {
   mapStore.addCharacter(data)
 })
 
-socketManager.on(SocketEvent.MAP_CHARACTER_LEAVE, (characterId: UUID) => {
+gameStore.connection?.on('map:character:leave', (characterId: UUID) => {
   mapStore.removeCharacter(characterId)
 })
 
-socketManager.on(SocketEvent.MAP_CHARACTER_MOVE, ([characterId, posX, posY, rot, isMoving]: [UUID, number, number, number, boolean]) => {
+gameStore.connection?.on('map:character:move', (data: { characterId: UUID; positionX: number; positionY: number; rotation: number; isMoving: boolean }) => {
-  mapStore.updateCharacterPosition([characterId, posX, posY, rot, isMoving])
+  mapStore.updateCharacterPosition(data)
-
+  // @TODO: Replace with universal class, composable or store
-  if (characterId === gameStore.character?.id) {
+  if (data.characterId === gameStore.character?.id) {
-    gameStore.character!.positionX = posX
+    gameStore.character!.positionX = data.positionX
-    gameStore.character!.positionY = posY
+    gameStore.character!.positionY = data.positionY
-    gameStore.character!.rotation = rot
+    gameStore.character!.rotation = data.rotation
   }
 })
 
-socketManager.on(SocketEvent.MAP_CHARACTER_ATTACK, (characterId: UUID) => {
+gameStore.connection?.on('map:character:attack', (characterId: UUID) => {
   mapStore.updateCharacterProperty(characterId, 'isAttacking', true)
 })
 
 onUnmounted(() => {
-  socketManager.off(SocketEvent.MAP_CHARACTER_ATTACK)
+  gameStore.connection?.off('map:character:join')
-  socketManager.off(SocketEvent.MAP_CHARACTER_MOVE)
+  gameStore.connection?.off('map:character:leave')
-  socketManager.off(SocketEvent.MAP_CHARACTER_JOIN)
+  gameStore.connection?.off('map:character:move')
-  socketManager.off(SocketEvent.MAP_CHARACTER_LEAVE)
 })
 </script>

src/components/game/map/Map.vue

@@ -5,13 +5,11 @@
 </template>
 
 <script setup lang="ts">
-import { SocketEvent } from '@/application/enums'
 import type { mapLoadData } from '@/application/types'
 import { unduplicateArray } from '@/application/utilities'
 import Characters from '@/components/game/map/Characters.vue'
 import MapTiles from '@/components/game/map/MapTiles.vue'
 import PlacedMapObjects from '@/components/game/map/PlacedMapObjects.vue'
-import { socketManager } from '@/managers/SocketManager'
 import { createTileLayer, createTileMap, loadTileTexturesFromMapTileArray } from '@/services/mapService'
 import { MapStorage } from '@/storage/storages'
 import { useGameStore } from '@/stores/gameStore'
@@ -30,7 +28,7 @@ const tileMap = shallowRef<Phaser.Tilemaps.Tilemap>()
 const tileMapLayer = shallowRef<Phaser.Tilemaps.TilemapLayer>()
 
 // Event listeners
-socketManager.on(SocketEvent.MAP_CHARACTER_TELEPORT, (data: mapLoadData) => {
+gameStore.connection?.on('map:character:teleport', async (data: mapLoadData) => {
   mapStore.setMapId(data.mapId)
   mapStore.setCharacters(data.characters)
 })
@@ -66,6 +64,6 @@ onUnmounted(() => {
     tileMap.value.destroy()
   }
 
-  socketManager.off(SocketEvent.MAP_CHARACTER_TELEPORT)
+  gameStore.connection?.off('map:character:teleport')
 })
 </script>

src/components/game/map/partials/ImageGroup.vue

@@ -1,102 +0,0 @@
-<template>
-  <Zone :depth="baseDepth" :origin-x="mapObj?.originX" :origin-y="mapObj?.originY" :width="mapObj?.frameWidth" :height="mapObj?.frameHeight" :x="x" :y="y" />
-</template>
-
-<script setup lang="ts">
-import type { MapObject, PlacedMapObject } from '@/application/types'
-import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
-import { calculateIsometricDepth } from '@/services/mapService'
-import { onPreUpdate, useScene, Zone } from 'phavuer'
-import { computed, onUnmounted } from 'vue'
-
-interface Props {
-  obj?: PlacedMapObject
-  mapObj?: MapObject
-  x?: number
-  y?: number
-}
-
-const props = defineProps<Props>()
-const mapEditor = useMapEditorComposable()
-const scene = useScene()
-
-const group = scene.add.group()
-const partitionPoints = computed(() => {
-  if (!props.mapObj?.frameWidth || !props.mapObj?.depthOffsets.length) return []
-
-  const sliceCount = props.mapObj.depthOffsets.length
-  return Array.from({ length: sliceCount + 1 }, (_, i) => i * (props.mapObj!.frameWidth / sliceCount))
-})
-
-let baseDepth = 0
-
-const createImagePartition = (startX: number, endX: number, depthOffset: number): void => {
-  if (!props.mapObj?.id) return
-
-  const img = scene.add.image(0, 0, props.mapObj.id)
-  img.setOrigin(props.mapObj.originX, props.mapObj.originY)
-  img.setCrop(startX, 0, endX, props.mapObj.frameHeight)
-  img.setDepth(baseDepth + depthOffset)
-  group.add(img)
-}
-
-const updateGroupProperties = (): void => {
-  if (!props.obj || !props.x || !props.y) return
-
-  const isMoving = mapEditor.movingPlacedObject.value?.id === props.obj.id
-  const isSelected = mapEditor.selectedMapObject.value?.id === props.obj.id
-  const isPlacedSelected = mapEditor.selectedPlacedObject.value?.id === props.obj.id
-
-  baseDepth = calculateIsometricDepth(props.obj.positionX, props.obj.positionY)
-
-  group.setXY(props.x, props.y)
-  group.setAlpha(isMoving || isSelected ? 0.5 : 1)
-  group.setTint(isPlacedSelected ? 0x00ff00 : 0xffffff)
-  group.setDepth(baseDepth)
-}
-
-const updateImageProperties = (): void => {
-  const orderedImages = group.getChildren() as Phaser.GameObjects.Image[]
-
-  orderedImages.forEach((image, index) => {
-    if (!props.obj || !props.mapObj || !props.x) return
-
-    image.flipX = props.obj.isRotated
-
-    if (props.obj.isRotated) {
-      const offsetNum = props.mapObj.depthOffsets.length
-      const xOffset = props.mapObj.frameWidth / offsetNum
-      image.x = props.x + (index < offsetNum / 2 ? -xOffset : xOffset)
-      image.setDepth(baseDepth - props.mapObj.depthOffsets[index])
-    } else {
-      image.x = props.x
-      image.setDepth(baseDepth + props.mapObj.depthOffsets[index])
-    }
-  })
-}
-
-onPreUpdate(() => {
-  updateGroupProperties()
-  updateImageProperties()
-})
-
-// Initial setup
-const initializeGroup = (): void => {
-  if (!props.mapObj || !props.x || !props.y || !props.obj) return
-
-  baseDepth = calculateIsometricDepth(props.obj.positionX, props.obj.positionY)
-  group.setXY(props.x, props.y)
-  group.setOrigin(props.mapObj.originX, props.mapObj.originY)
-
-  const points = partitionPoints.value
-  for (let i = 0; i < points.length - 1; i++) {
-    createImagePartition(points[i], points[i + 1], props.mapObj.depthOffsets[i])
-  }
-}
-
-initializeGroup()
-
-onUnmounted(() => {
-  group.destroy(true, true)
-})
-</script>

src/components/game/map/partials/PlacedMapObject.vue

@@ -1,15 +1,16 @@
 <template>
-  <ImageGroup v-bind="groupProps" v-if="mapObject && gameStore.isTextureLoaded(props.placedMapObject.mapObject as string)" />
+  <Image v-if="mapObject && gameStore.isTextureLoaded(props.placedMapObject.mapObject as string)" v-bind="imageProps" />
 </template>
 
 <script setup lang="ts">
+import config from '@/application/config'
 import type { MapObject, PlacedMapObject } from '@/application/types'
-import ImageGroup from '@/components/game/map/partials/ImageGroup.vue'
+import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
-import { loadMapObjectTextures, tileToWorldXY } from '@/services/mapService'
+import { calculateIsometricDepth, loadMapObjectTextures, tileToWorldXY } from '@/services/mapService'
 import { MapObjectStorage } from '@/storage/storages'
 import { useGameStore } from '@/stores/gameStore'
-import { useScene } from 'phavuer'
+import { Image, useScene } from 'phavuer'
-import { computed, onMounted, ref } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
 
 import Tilemap = Phaser.Tilemaps.Tilemap
 import TilemapLayer = Phaser.Tilemaps.TilemapLayer
@@ -23,15 +24,10 @@ const props = defineProps<{
 const scene = useScene()
 
 const gameStore = useGameStore()
+const mapEditor = useMapEditorComposable()
 
 const mapObject = ref<MapObject>()
 
-const groupProps = computed(() => ({
-  ...calculateObjectPlacement(props.placedMapObject),
-  mapObj: mapObject.value,
-  obj: props.placedMapObject
-}))
-
 async function initialize() {
   if (!props.placedMapObject.mapObject) return
 
@@ -48,8 +44,6 @@ async function initialize() {
   const _mapObject = await mapObjectStorage.getById(props.placedMapObject.mapObject as string)
   if (!_mapObject) return
 
-  console.log(_mapObject)
-
   mapObject.value = _mapObject
 
   await loadMapObjectTextures([_mapObject], scene)
@@ -59,11 +53,29 @@ function calculateObjectPlacement(mapObj: PlacedMapObject): { x: number; y: numb
   let position = tileToWorldXY(props.tileMapLayer, mapObj.positionX, mapObj.positionY)
 
   return {
-    x: position.worldPositionX,
+    x: position.worldPositionX - mapObject.value!.frameWidth / 2,
-    y: position.worldPositionY
+    y: position.worldPositionY - mapObject.value!.frameHeight / 2 + config.tile_size.height
   }
 }
 
+const imageProps = computed(() => ({
+  alpha: mapEditor.movingPlacedObject.value?.id == props.placedMapObject.id ? 0.5 : 1,
+  tint: mapEditor.selectedPlacedObject.value?.id == props.placedMapObject.id ? 0x00ff00 : 0xffffff,
+  depth: calculateIsometricDepth(props.placedMapObject.positionX, props.placedMapObject.positionY, mapObject.value!.frameWidth, mapObject.value!.frameHeight),
+  ...calculateObjectPlacement(props.placedMapObject),
+  flipX: props.placedMapObject.isRotated,
+  texture: mapObject.value!.id,
+  originX: mapObject.value!.originX,
+  originY: mapObject.value!.originY
+}))
+
+watch(
+  () => mapEditor.refreshMapObject.value,
+  async () => {
+    await initialize()
+  }
+)
+
 onMounted(async () => {
   await initialize()
 })

src/components/gameMaster/GmPanel.vue

@@ -20,9 +20,9 @@
 <script setup lang="ts">
 import AssetManager from '@/components/gameMaster/assetManager/AssetManager.vue'
 import Modal from '@/components/utilities/Modal.vue'
-import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
 import { useGameStore } from '@/stores/gameStore'
 import { ref } from 'vue'
+import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
 
 const mapEditor = useMapEditorComposable()
 const gameStore = useGameStore()

src/components/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue

@@ -20,29 +20,12 @@
           </select>
         </div>
         <div class="form-field-full">
-          <div class="space-x-6 flex items-center">
-            <label for="color">Color</label>
-            <input v-model="characterColor" class="input-field" type="text" name="color" placeholder="Character Hair Color" />
-            <div class="h-[38px] w-[38px] rounded" :style="{ backgroundColor: characterColor }"></div>
-          </div>
-        </div>
-        <div class="form-field-half">
           <label for="spriteId">Sprite</label>
           <select v-model="characterSpriteId" class="input-field" name="spriteId">
             <option disabled selected value="">Select sprite</option>
             <option v-for="sprite in assetManagerStore.spriteList" :key="sprite.id" :value="sprite.id">{{ sprite.name }}</option>
           </select>
         </div>
-        <div class="form-field-half">
-          <label>Preview</label>
-          <div v-if="characterSpriteId" class="flex flex-col">
-            <div class="p-3 pb-5 min-h-32 block rounded-md default-border bg-gray-800">
-              <div class="flex items-center justify-center p-1 h-full bg-gray-700 rounded">
-                <img :src="config.server_endpoint + '/textures/sprites/' + characterSpriteId + '/front.png'" class="max-w-[200px] max-h-[200px] object-contain" />
-              </div>
-            </div>
-          </div>
-        </div>
         <button class="btn-cyan px-4 py-1.5 min-w-24" type="submit">Save</button>
         <button class="btn-red px-4 py-1.5 min-w-24" type="button" @click.prevent="removeCharacterHair">Remove</button>
       </form>
@@ -51,50 +34,48 @@
 </template>
 
 <script setup lang="ts">
-import config from '@/application/config'
-import { SocketEvent } from '@/application/enums'
 import type { CharacterGender, CharacterHair, Sprite } from '@/application/types'
-import { downloadCache } from '@/application/utilities'
-import { socketManager } from '@/managers/SocketManager'
-import { CharacterHairStorage } from '@/storage/storages'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
+import { useGameStore } from '@/stores/gameStore'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
+const gameStore = useGameStore()
 const assetManagerStore = useAssetManagerStore()
 
 const selectedCharacterHair = computed(() => assetManagerStore.selectedCharacterHair)
 
 const characterName = ref('')
 const characterGender = ref<CharacterGender>('MALE' as CharacterGender.MALE)
-const characterColor = ref<string>('#000000')
 const characterIsSelectable = ref<boolean>(false)
 const characterSpriteId = ref<string | null | undefined>(null)
+
 const genderOptions: CharacterGender[] = ['MALE' as CharacterGender.MALE, 'FEMALE' as CharacterGender.FEMALE]
 
+if (!selectedCharacterHair.value) {
+  console.error('No character hair selected')
+}
+
 if (selectedCharacterHair.value) {
   characterName.value = selectedCharacterHair.value.name
   characterGender.value = selectedCharacterHair.value.gender
-  characterColor.value = selectedCharacterHair.value.color
   characterIsSelectable.value = selectedCharacterHair.value.isSelectable
   characterSpriteId.value = selectedCharacterHair.value.sprite?.id
 }
 
-async function removeCharacterHair() {
+function removeCharacterHair() {
   if (!selectedCharacterHair.value) return
 
-  socketManager.emit(SocketEvent.GM_CHARACTERHAIR_REMOVE, { id: selectedCharacterHair.value.id }, async (response: boolean) => {
+  gameStore.connection?.emit('gm:characterHair:remove', { id: selectedCharacterHair.value.id }, (response: boolean) => {
     if (!response) {
       console.error('Failed to remove character hair')
       return
     }
-
+    refreshCharacterHairList()
-    await downloadCache('character_hair', new CharacterHairStorage())
-    await refreshCharacterHairList()
   })
 }
 
-async function refreshCharacterHairList(unsetSelectedCharacterHair = true) {
+function refreshCharacterHairList(unsetSelectedCharacterHair = true) {
-  socketManager.emit(SocketEvent.GM_CHARACTERHAIR_LIST, {}, (response: CharacterHair[]) => {
+  gameStore.connection?.emit('gm:characterHair:list', {}, (response: CharacterHair[]) => {
     assetManagerStore.setCharacterHairList(response)
 
     if (unsetSelectedCharacterHair) {
@@ -103,24 +84,21 @@ async function refreshCharacterHairList(unsetSelectedCharacterHair = true) {
   })
 }
 
-async function saveCharacterHair() {
+function saveCharacterHair() {
   const characterHairData = {
     id: selectedCharacterHair.value!.id,
     name: characterName.value,
     gender: characterGender.value,
-    color: characterColor.value,
     isSelectable: characterIsSelectable.value,
     spriteId: characterSpriteId.value
   }
 
-  socketManager.emit(SocketEvent.GM_CHARACTERHAIR_UPDATE, characterHairData, async (response: boolean) => {
+  gameStore.connection?.emit('gm:characterHair:update', characterHairData, (response: boolean) => {
     if (!response) {
       console.error('Failed to save character type')
       return
     }
-
+    refreshCharacterHairList(false)
-    await downloadCache('character_hair', new CharacterHairStorage())
-    await refreshCharacterHairList(false)
   })
 }
 
@@ -128,7 +106,6 @@ watch(selectedCharacterHair, (characterHair: CharacterHair | null) => {
   if (!characterHair) return
   characterName.value = characterHair.name
   characterGender.value = characterHair.gender
-  characterColor.value = characterHair.color
   characterIsSelectable.value = characterHair.isSelectable
   characterSpriteId.value = characterHair.sprite?.id
 })
@@ -136,7 +113,7 @@ watch(selectedCharacterHair, (characterHair: CharacterHair | null) => {
 onMounted(() => {
   if (!selectedCharacterHair.value) return
 
-  socketManager.emit(SocketEvent.GM_SPRITE_LIST, {}, (response: Sprite[]) => {
+  gameStore.connection?.emit('gm:sprite:list', {}, (response: Sprite[]) => {
     assetManagerStore.setSpriteList(response)
   })
 })

src/components/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue

@@ -32,9 +32,7 @@
 </template>
 
 <script setup lang="ts">
-import { SocketEvent } from '@/application/enums'
 import type { CharacterHair } from '@/application/types'
-import { socketManager } from '@/managers/SocketManager'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useGameStore } from '@/stores/gameStore'
 import { useVirtualList } from '@vueuse/core'
@@ -54,13 +52,13 @@ const handleSearch = () => {
 }
 
 const createNewCharacterHair = () => {
-  socketManager.emit(SocketEvent.GM_CHARACTERHAIR_CREATE, {}, (response: boolean) => {
+  gameStore.connection?.emit('gm:characterHair:create', {}, (response: boolean) => {
     if (!response) {
       console.error('Failed to create new character type')
       return
     }
 
-    socketManager.emit(SocketEvent.GM_CHARACTERHAIR_LIST, {}, (response: CharacterHair[]) => {
+    gameStore.connection?.emit('gm:characterHair:list', {}, (response: CharacterHair[]) => {
       assetManagerStore.setCharacterHairList(response)
     })
   })
@@ -94,7 +92,7 @@ function toTop() {
 }
 
 onMounted(() => {
-  socketManager.emit(SocketEvent.GM_CHARACTERHAIR_LIST, {}, (response: CharacterHair[]) => {
+  gameStore.connection?.emit('gm:characterHair:list', {}, (response: CharacterHair[]) => {
     assetManagerStore.setCharacterHairList(response)
   })
 })

src/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue

@@ -40,14 +40,12 @@
 </template>
 
 <script setup lang="ts">
-import { SocketEvent } from '@/application/enums'
 import type { CharacterGender, CharacterRace, CharacterType, Sprite } from '@/application/types'
-import { downloadCache } from '@/application/utilities'
-import { socketManager } from '@/managers/SocketManager'
-import { CharacterTypeStorage } from '@/storage/storages'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
+import { useGameStore } from '@/stores/gameStore'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
+const gameStore = useGameStore()
 const assetManagerStore = useAssetManagerStore()
 
 const selectedCharacterType = computed(() => assetManagerStore.selectedCharacterType)
@@ -73,22 +71,20 @@ if (selectedCharacterType.value) {
   characterSpriteId.value = selectedCharacterType.value.sprite?.id
 }
 
-async function removeCharacterType() {
+function removeCharacterType() {
   if (!selectedCharacterType.value) return
 
-  socketManager.emit(SocketEvent.GM_CHARACTERTYPE_REMOVE, { id: selectedCharacterType.value.id }, async (response: boolean) => {
+  gameStore.connection?.emit('gm:characterType:remove', { id: selectedCharacterType.value.id }, (response: boolean) => {
     if (!response) {
       console.error('Failed to remove character type')
       return
     }
-
+    refreshCharacterTypeList()
-    await downloadCache('character_types', new CharacterTypeStorage())
-    await refreshCharacterTypeList()
   })
 }
 
-async function refreshCharacterTypeList(unsetSelectedCharacterType = true) {
+function refreshCharacterTypeList(unsetSelectedCharacterType = true) {
-  socketManager.emit(SocketEvent.GM_CHARACTERTYPE_LIST, {}, (response: CharacterType[]) => {
+  gameStore.connection?.emit('gm:characterType:list', {}, (response: CharacterType[]) => {
     assetManagerStore.setCharacterTypeList(response)
 
     if (unsetSelectedCharacterType) {
@@ -97,7 +93,7 @@ async function refreshCharacterTypeList(unsetSelectedCharacterType = true) {
   })
 }
 
-async function saveCharacterType() {
+function saveCharacterType() {
   const characterTypeData = {
     id: selectedCharacterType.value!.id,
     name: characterName.value,
@@ -107,14 +103,12 @@ async function saveCharacterType() {
     spriteId: characterSpriteId.value
   }
 
-  socketManager.emit(SocketEvent.GM_CHARACTERTYPE_UPDATE, characterTypeData, async (response: boolean) => {
+  gameStore.connection?.emit('gm:characterType:update', characterTypeData, (response: boolean) => {
     if (!response) {
       console.error('Failed to save character type')
       return
     }
-
+    refreshCharacterTypeList(false)
-    await downloadCache('character_types', new CharacterTypeStorage())
-    await refreshCharacterTypeList(false)
   })
 }
 
@@ -130,7 +124,7 @@ watch(selectedCharacterType, (characterType: CharacterType | null) => {
 onMounted(() => {
   if (!selectedCharacterType.value) return
 
-  socketManager.emit(SocketEvent.GM_SPRITE_LIST, {}, (response: Sprite[]) => {
+  gameStore.connection?.emit('gm:sprite:list', {}, (response: Sprite[]) => {
     assetManagerStore.setSpriteList(response)
   })
 })

src/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue

@@ -32,9 +32,7 @@
 </template>
 
 <script setup lang="ts">
-import { SocketEvent } from '@/application/enums'
 import type { CharacterType } from '@/application/types'
-import { socketManager } from '@/managers/SocketManager'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useGameStore } from '@/stores/gameStore'
 import { useVirtualList } from '@vueuse/core'
@@ -54,13 +52,13 @@ const handleSearch = () => {
 }
 
 const createNewCharacterType = () => {
-  socketManager.emit(SocketEvent.GM_CHARACTERTYPE_CREATE, {}, (response: boolean) => {
+  gameStore.connection?.emit('gm:characterType:create', {}, (response: boolean) => {
     if (!response) {
       console.error('Failed to create new character type')
       return
     }
 
-    socketManager.emit(SocketEvent.GM_CHARACTERTYPE_LIST, {}, (response: CharacterType[]) => {
+    gameStore.connection?.emit('gm:characterType:list', {}, (response: CharacterType[]) => {
       assetManagerStore.setCharacterTypeList(response)
     })
   })
@@ -94,7 +92,7 @@ function toTop() {
 }
 
 onMounted(() => {
-  socketManager.emit(SocketEvent.GM_CHARACTERTYPE_LIST, {}, (response: CharacterType[]) => {
+  gameStore.connection?.emit('gm:characterType:list', {}, (response: CharacterType[]) => {
     assetManagerStore.setCharacterTypeList(response)
   })
 })

src/components/gameMaster/assetManager/partials/item/itemDetails.vue

@@ -44,9 +44,7 @@
 </template>
 
 <script setup lang="ts">
-import { SocketEvent } from '@/application/enums'
 import type { Item, ItemRarity, ItemType, Sprite } from '@/application/types'
-import { socketManager } from '@/managers/SocketManager'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useGameStore } from '@/stores/gameStore'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
@@ -82,7 +80,7 @@ if (selectedItem.value) {
 function removeItem() {
   if (!selectedItem.value) return
 
-  socketManager.emit(SocketEvent.GM_ITEM_REMOVE, { id: selectedItem.value.id }, (response: boolean) => {
+  gameStore.connection?.emit('gm:item:remove', { id: selectedItem.value.id }, (response: boolean) => {
     if (!response) {
       console.error('Failed to remove item')
       return
@@ -92,7 +90,7 @@ function removeItem() {
 }
 
 function refreshItemList(unsetSelectedItem = true) {
-  socketManager.emit(SocketEvent.GM_ITEM_LIST, {}, (response: Item[]) => {
+  gameStore.connection?.emit('gm:item:list', {}, (response: Item[]) => {
     assetManagerStore.setItemList(response)
 
     if (unsetSelectedItem) {
@@ -112,7 +110,7 @@ function saveItem() {
     spriteId: itemSpriteId.value
   }
 
-  socketManager.emit(SocketEvent.GM_ITEM_UPDATE, itemData, (response: boolean) => {
+  gameStore.connection?.emit('gm:item:update', itemData, (response: boolean) => {
     if (!response) {
       console.error('Failed to save item')
       return
@@ -134,7 +132,7 @@ watch(selectedItem, (item: Item | null) => {
 onMounted(() => {
   if (!selectedItem.value) return
 
-  socketManager.emit(SocketEvent.GM_SPRITE_LIST, {}, (response: Sprite[]) => {
+  gameStore.connection?.emit('gm:sprite:list', {}, (response: Sprite[]) => {
     assetManagerStore.setSpriteList(response)
   })
 })

src/components/gameMaster/assetManager/partials/item/itemList.vue

@@ -29,9 +29,7 @@
 </template>
 
 <script setup lang="ts">
-import { SocketEvent } from '@/application/enums'
 import type { Item } from '@/application/types'
-import { socketManager } from '@/managers/SocketManager'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useGameStore } from '@/stores/gameStore'
 import { useVirtualList } from '@vueuse/core'
@@ -50,13 +48,13 @@ const handleSearch = () => {
 }
 
 const createNewItem = () => {
-  socketManager.emit(SocketEvent.GM_ITEM_CREATE, {}, (response: boolean) => {
+  gameStore.connection?.emit('gm:item:create', {}, (response: boolean) => {
     if (!response) {
       console.error('Failed to create new item')
       return
     }
 
-    socketManager.emit(SocketEvent.GM_ITEM_LIST, {}, (response: Item[]) => {
+    gameStore.connection?.emit('gm:item:list', {}, (response: Item[]) => {
       assetManagerStore.setItemList(response)
     })
   })
@@ -90,7 +88,7 @@ function toTop() {
 }
 
 onMounted(() => {
-  socketManager.emit(SocketEvent.GM_ITEM_LIST, {}, (response: Item[]) => {
+  gameStore.connection?.emit('gm:item:list', {}, (response: Item[]) => {
     assetManagerStore.setItemList(response)
   })
 })

src/components/gameMaster/assetManager/partials/mapObject/MapObjectDetails.vue

@@ -1,30 +1,8 @@
 <template>
   <div class="h-full overflow-auto">
     <div class="relative p-2.5 flex flex-col items-center justify-center h-72 rounded-md default-border bg-gray">
-      <div class="grid grid-cols-[160px_auto_max-content] gap-12">
+      <img class="max-h-56" :src="`${config.server_endpoint}/textures/map_objects/${selectedMapObject?.id}.png`" :alt="'Object ' + selectedMapObject?.id" />
-        <div>
-          <input type="checkbox" checked v-model="showOrigin" /><label>Show Origin</label>
-          <br />
-          <input type="checkbox" checked v-model="showPartitionOverlay" /><label>Show Partitions</label>
-        </div>
-        <div class="relative w-fit h-fit">
-          <img class="max-h-56" :src="`${config.server_endpoint}/textures/map_objects/${selectedMapObject?.id}.png`" :alt="'Object ' + selectedMapObject?.id" ref="imageRef" />
-          <svg ref="svg" class="absolute top-0 left-0 w-full h-full inline-block pointer-events-none">
-            <circle v-if="showOrigin && svg" r="4" :cx="mapObjectOriginX * width" :cy="mapObjectOriginY * height" stroke="white" stroke-width="2" />
-            <rect v-if="showPartitionOverlay && svg" v-for="(offset, index) in mapObjectDepthOffsets" style="opacity: 0.5" stroke="red" :x="index * (width / mapObjectDepthOffsets.length)" :width="width / mapObjectDepthOffsets.length" :y="0" :height="height" />
-          </svg>
-        </div>
-        <div>
-          <button class="btn-cyan px-4 py-1.5 min-w-24" @click="mapObjectDepthOffsets.push(0)">Add Partition</button>
-          <p>Depth Offset</p>
-          <div class="text-white grid grid-cols-[120px_80px_auto] items-baseline gap-2" v-for="(offset, index) in mapObjectDepthOffsets">
-            <input class="input-field max-h-4 mt-2" type="number" :value="offset" @change="setPartitionDepth($event, index)" />
-            <button @click="mapObjectDepthOffsets.splice(index, 1)">Remove</button>
-          </div>
-        </div>
-      </div>
     </div>
-
     <div class="mt-5 block">
       <form class="flex gap-2.5 flex-wrap" @submit.prevent="saveObject">
         <div class="form-field-full">
@@ -66,34 +44,24 @@
 
 <script setup lang="ts">
 import config from '@/application/config'
-import { SocketEvent } from '@/application/enums'
 import type { MapObject } from '@/application/types'
-import { downloadCache } from '@/application/utilities'
 import ChipsInput from '@/components/forms/ChipsInput.vue'
-import { socketManager } from '@/managers/SocketManager'
-import { MapObjectStorage } from '@/storage/storages'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
-import { useElementSize } from '@vueuse/core'
+import { useGameStore } from '@/stores/gameStore'
-import { Rectangle } from 'phavuer'
+import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
-import { computed, onBeforeUnmount, onMounted, ref, useTemplateRef, watch } from 'vue'
 
+const gameStore = useGameStore()
 const assetManagerStore = useAssetManagerStore()
 
 const selectedMapObject = computed(() => assetManagerStore.selectedMapObject)
-const svg = useTemplateRef('svg')
-const { width, height } = useElementSize(svg)
 
 const mapObjectName = ref('')
 const mapObjectTags = ref<string[]>([])
-const mapObjectDepthOffsets = ref<number[]>([])
 const mapObjectOriginX = ref(0)
 const mapObjectOriginY = ref(0)
 const mapObjectFrameRate = ref(0)
 const mapObjectFrameWidth = ref(0)
 const mapObjectFrameHeight = ref(0)
-const imageRef = ref<HTMLImageElement | null>(null)
-const showOrigin = ref(true)
-const showPartitionOverlay = ref(true)
 
 if (!selectedMapObject.value) {
   console.error('No map mapObject selected')
@@ -102,7 +70,6 @@ if (!selectedMapObject.value) {
 if (selectedMapObject.value) {
   mapObjectName.value = selectedMapObject.value.name
   mapObjectTags.value = selectedMapObject.value.tags
-  mapObjectDepthOffsets.value = selectedMapObject.value.depthOffsets
   mapObjectOriginX.value = selectedMapObject.value.originX
   mapObjectOriginY.value = selectedMapObject.value.originY
   mapObjectFrameRate.value = selectedMapObject.value.frameRate
@@ -110,23 +77,18 @@ if (selectedMapObject.value) {
   mapObjectFrameHeight.value = selectedMapObject.value.frameHeight
 }
 
-const setPartitionDepth = (event: any, idx: number) => (mapObjectDepthOffsets.value[idx] = Number.parseInt(event.target.value))
+function removeObject() {
-
+  gameStore.connection?.emit('gm:mapObject:remove', { mapObject: selectedMapObject.value?.id }, (response: boolean) => {
-async function removeObject() {
-  if (!selectedMapObject.value) return
-  socketManager.emit(SocketEvent.GM_MAPOBJECT_REMOVE, { mapObjectId: selectedMapObject.value.id }, async (response: boolean) => {
     if (!response) {
       console.error('Failed to remove mapObject')
       return
     }
-
+    refreshObjectList()
-    await downloadCache('map_objects', new MapObjectStorage())
-    await refreshObjectList()
   })
 }
 
-async function refreshObjectList(unsetSelectedMapObject = true) {
+function refreshObjectList(unsetSelectedMapObject = true) {
-  socketManager.emit(SocketEvent.GM_MAPOBJECT_LIST, {}, (response: MapObject[]) => {
+  gameStore.connection?.emit('gm:mapObject:list', {}, (response: MapObject[]) => {
     assetManagerStore.setMapObjectList(response)
 
     if (unsetSelectedMapObject) {
@@ -135,32 +97,30 @@ async function refreshObjectList(unsetSelectedMapObject = true) {
   })
 }
 
-async function saveObject() {
+function saveObject() {
   if (!selectedMapObject.value) {
     console.error('No mapObject selected')
     return
   }
-  socketManager.emit(
+
-    SocketEvent.GM_MAPOBJECT_UPDATE,
+  gameStore.connection?.emit(
+    'gm:mapObject:update',
     {
       id: selectedMapObject.value.id,
       name: mapObjectName.value,
       tags: mapObjectTags.value,
-      depthOffsets: mapObjectDepthOffsets.value,
       originX: mapObjectOriginX.value,
       originY: mapObjectOriginY.value,
       frameRate: mapObjectFrameRate.value,
       frameWidth: mapObjectFrameWidth.value,
       frameHeight: mapObjectFrameHeight.value
     },
-    async (response: boolean) => {
+    (response: boolean) => {
       if (!response) {
         console.error('Failed to save mapObject')
         return
       }
-
+      refreshObjectList(false)
-      await downloadCache('map_objects', new MapObjectStorage())
-      await refreshObjectList(false)
     }
   )
 }
@@ -169,7 +129,6 @@ watch(selectedMapObject, (mapObject: MapObject | null) => {
   if (!mapObject) return
   mapObjectName.value = mapObject.name
   mapObjectTags.value = mapObject.tags
-  mapObjectDepthOffsets.value = mapObject.depthOffsets
   mapObjectOriginX.value = mapObject.originX
   mapObjectOriginY.value = mapObject.originY
   mapObjectFrameRate.value = mapObject.frameRate
@@ -181,37 +140,7 @@ onMounted(() => {
   if (!selectedMapObject.value) return
 })
 
-// function startDragging(index: number, event: MouseEvent) {
-//   isDragging.value = true
-//   draggedPointIndex.value = index
-//
-//   const moveHandler = (e: MouseEvent) => {
-//     if (!isDragging.value || !imageRef.value) return
-//     const rect = imageRef.value.getBoundingClientRect()
-//     mapObjectPivotPoints.value[draggedPointIndex.value] = {
-//       x: e.clientX - rect.left,
-//       y: e.clientY - rect.top
-//     }
-//   }
-//
-//   const upHandler = () => {
-//     isDragging.value = false
-//     draggedPointIndex.value = -1
-//     window.removeEventListener('mousemove', moveHandler)
-//     window.removeEventListener('mouseup', upHandler)
-//   }
-//
-//   window.addEventListener('mousemove', moveHandler)
-//   window.addEventListener('mouseup', upHandler)
-// }
-
 onBeforeUnmount(() => {
   assetManagerStore.setSelectedMapObject(null)
 })
 </script>
-
-<style scoped>
-.pointer-events-none {
-  pointer-events: none;
-}
-</style>

src/components/gameMaster/assetManager/partials/mapObject/MapObjectList.vue

@@ -29,9 +29,7 @@
 
 <script setup lang="ts">
 import config from '@/application/config'
-import { SocketEvent } from '@/application/enums'
 import type { MapObject } from '@/application/types'
-import { socketManager } from '@/managers/SocketManager'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useGameStore } from '@/stores/gameStore'
 import { useVirtualList } from '@vueuse/core'
@@ -49,13 +47,13 @@ const elementToScroll = ref()
 const handleFileUpload = (e: Event) => {
   const files = (e.target as HTMLInputElement).files
   if (!files) return
-  socketManager.emit(SocketEvent.GM_MAPOBJECT_UPLOAD, files, (response: boolean) => {
+  gameStore.connection?.emit('gm:mapObject:upload', files, (response: boolean) => {
     if (!response) {
       if (config.environment === 'development') console.error('Failed to upload map object')
       return
     }
 
-    socketManager.emit(SocketEvent.GM_MAPOBJECT_LIST, {}, (response: MapObject[]) => {
+    gameStore.connection?.emit('gm:mapObject:list', {}, (response: MapObject[]) => {
       assetManagerStore.setMapObjectList(response)
     })
   })
@@ -94,7 +92,7 @@ function toTop() {
 }
 
 onMounted(() => {
-  socketManager.emit(SocketEvent.GM_MAPOBJECT_LIST, {}, (response: MapObject[]) => {
+  gameStore.connection?.emit('gm:mapObject:list', {}, (response: MapObject[]) => {
     assetManagerStore.setMapObjectList(response)
   })
 })

src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue

@@ -1,11 +1,12 @@
 <template>
   <div class="h-full overflow-auto">
     <div class="relative flex flex-col">
-      <div class="flex flex-wrap gap-2 p-2.5 rounded-md default-border bg-gray mb-4">
+      <div class="flex flex-wrap gap-2 p-2.5 rounded-md default-border bg-gray">
         <div class="w-full flex flex-col">
           <label class="mb-1.5 font-titles" for="name">Name</label>
           <input v-model="spriteName" class="input-field" type="text" name="name" placeholder="New sprite" />
         </div>
+
         <div class="w-full flex gap-2 mt-2 pb-4 relative">
           <button class="btn-cyan px-4 py-2 flex-1 sm:flex-none sm:min-w-24" type="button" @click.prevent="saveSprite">Save</button>
           <button class="btn-red px-4 py-2 flex-1 sm:flex-none sm:min-w-24" type="button" @click.prevent="deleteSprite">Delete</button>
@@ -14,62 +15,77 @@
               <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 16H6a2 2 0 01-2-2V6a2 2 0 012-2h8a2 2 0 012 2v2m-6 12h8a2 2 0 002-2v-8a2 2 0 00-2-2h-8a2 2 0 00-2 2v8a2 2 0 002 2z" />
             </svg>
           </button>
-          <button class="btn-cyan px-4" type="button" @click.prevent="addNewImage">New action</button>
         </div>
       </div>
-      <div v-for="action in spriteActions" :key="action.id">
+
-        <div class="flex flex-wrap gap-3 mb-3">
+      <button class="btn-cyan py-2 my-4" type="button" @click.prevent="addNewImage">New action</button>
-          <div v-for="(image, index) in action.sprites" :key="index" class="h-20 w-20 p-4 bg-gray-300 bg-opacity-50 rounded text-center relative group">
+      <Accordion v-for="action in spriteActions" :key="action.id">
-            <img :src="image.url" class="max-w-full max-h-full object-contain pointer-events-none" alt="Uploaded image" @load="updateImageDimensions($event, index)" />
+        <template #header>
-            <div v-if="imageDimensions[index]" class="absolute bottom-1 right-1 bg-black/50 text-white text-xs px-1 py-0.5 rounded transition-opacity font-default">{{ imageDimensions[index].width }}x{{ imageDimensions[index].height }}</div>
+          <div class="flex items-center">
+            {{ action.action }}
+            <div class="ml-auto space-x-2">
+              <button class="btn-cyan px-4 py-1.5 min-w-24" type="button" @click.stop.prevent="openPreviewModal(action)">View</button>
+              <button class="btn-red px-4 py-1.5 min-w-24" type="button" @click.stop.prevent="() => spriteActions.splice(spriteActions.indexOf(action), 1)">Delete</button>
+            </div>
           </div>
-        </div>
+        </template>
-        <div class="flex items-center mb-3">
+        <template #content>
-          <div class="mr-3 space-x-2">
+          <form class="flex gap-2.5 flex-wrap" @submit.prevent="saveSprite">
-            <button class="btn-cyan px-4 py-1.5 min-w-24 text-left" type="button" @click.stop.prevent="openEditorModal(action)">
+            <div class="form-field-full">
-              Editor
+              <label for="action">Action</label>
-              <div class="flex">
+              <input v-model="action.action" class="input-field" type="text" name="action" placeholder="Action" />
-                <small class="text-xs font-default">{{ action.action }}</small>
+            </div>
-              </div>
+            <div class="form-field-half">
-            </button>
+              <label for="origin-x">Origin X</label>
-          </div>
+              <input v-model.number="action.originX" class="input-field" type="number" step="any" name="origin-x" placeholder="Origin X" />
-        </div>
+            </div>
-      </div>
+            <div class="form-field-half">
-      <SpriteEditor
+              <label for="origin-y">Origin Y</label>
-          v-for="[actionId, editorData] in Array.from(openEditors.entries())"
+              <input v-model.number="action.originY" class="input-field" type="number" step="any" name="origin-y" placeholder="Origin Y" />
-          :key="actionId"
+            </div>
-          :sprite="selectedSprite!"
+            <div class="form-field-full">
-          :sprites="editorData.action.sprites"
+              <label for="frame-speed">Frame rate</label>
-          :frame-rate="editorData.action.frameRate"
+              <input v-model.number="action.frameRate" class="input-field" type="number" step="any" name="frame-speed" placeholder="Frame rate" />
-          :is-modal-open="editorData.isOpen"
+            </div>
-          :temp-offset-index="getTempOffsetIndex(editorData.action)"
+            <div class="form-field-full">
-          :temp-offset="getTempOffset(editorData.action)"
+              <SpriteActionsInput v-model="action.sprites" @tempOffsetChange="(index, offset) => handleTempOffsetChange(action, index, offset)" />
-          @update:frame-rate="(value) => updateFrameRate(editorData.action, value)"
+            </div>
-          @update:is-modal-open="(value) => handleEditorModalClose(editorData.action, value)"
+          </form>
-          @update:temp-offset="(index, offset) => handleTempOffsetChange(editorData.action, index, offset)"
+        </template>
+      </Accordion>
+      <SpritePreview
+        v-if="selectedAction"
+        :sprites="selectedAction.sprites"
+        :frame-rate="selectedAction.frameRate"
+        :is-modal-open="isModalOpen"
+        :temp-offset-index="tempOffsetData.index"
+        :temp-offset="tempOffsetData.offset"
+        @update:frame-rate="updateFrameRate"
+        @update:is-modal-open="isModalOpen = $event"
       />
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { SocketEvent } from '@/application/enums'
+import type { Sprite, SpriteAction, UUID } from '@/application/types'
-import type { Sprite, SpriteAction } from '@/application/types'
+import { uuidv4 } from '@/application/utilities'
-import { downloadCache, uuidv4 } from '@/application/utilities'
+import SpriteActionsInput from '@/components/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue'
-import SpriteEditor from '@/components/gameMaster/assetManager/partials/sprite/partials/SpriteEditor.vue'
+import SpritePreview from '@/components/gameMaster/assetManager/partials/sprite/partials/SpritePreview.vue'
-import { socketManager } from '@/managers/SocketManager'
+import Accordion from '@/components/utilities/Accordion.vue'
-import { SpriteStorage } from '@/storage/storages'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
+import { useGameStore } from '@/stores/gameStore'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
+const gameStore = useGameStore()
 const assetManagerStore = useAssetManagerStore()
 
 const selectedSprite = computed(() => assetManagerStore.selectedSprite)
-const tempOffsetData = ref<Map<string, { index: number | undefined; offset: { x: number; y: number } | undefined }>>(new Map())
+
 const spriteName = ref('')
 const spriteActions = ref<SpriteAction[]>([])
-
+const isModalOpen = ref(false)
-const openEditors = ref(new Map<string, { action: SpriteAction; isOpen: boolean }>())
+const selectedAction = ref<SpriteAction | null>(null)
 
 if (!selectedSprite.value) {
   console.error('No sprite selected')
@@ -80,32 +96,28 @@ if (selectedSprite.value) {
   spriteActions.value = sortSpriteActions(selectedSprite.value.spriteActions)
 }
 
-async function deleteSprite() {
+function deleteSprite() {
-  socketManager.emit(SocketEvent.GM_SPRITE_DELETE, { id: selectedSprite.value?.id }, async (response: boolean) => {
+  gameStore.connection?.emit('gm:sprite:delete', { id: selectedSprite.value?.id }, (response: boolean) => {
     if (!response) {
       console.error('Failed to delete sprite')
       return
     }
-
+    refreshSpriteList()
-    await downloadCache('sprites', new SpriteStorage())
-    await refreshSpriteList()
   })
 }
 
-async function copySprite() {
+function copySprite() {
-  socketManager.emit(SocketEvent.GM_SPRITE_COPY, { id: selectedSprite.value?.id }, async (response: boolean) => {
+  gameStore.connection?.emit('gm:sprite:copy', { id: selectedSprite.value?.id }, (response: boolean) => {
     if (!response) {
       console.error('Failed to copy sprite')
       return
     }
-
+    refreshSpriteList(false)
-    await downloadCache('sprites', new SpriteStorage())
-    await refreshSpriteList(false)
   })
 }
 
-async function refreshSpriteList(unsetSelectedSprite = true) {
+function refreshSpriteList(unsetSelectedSprite = true) {
-  socketManager.emit(SocketEvent.GM_SPRITE_LIST, {}, (response: Sprite[]) => {
+  gameStore.connection?.emit('gm:sprite:list', {}, (response: Sprite[]) => {
     assetManagerStore.setSpriteList(response)
 
     if (unsetSelectedSprite) {
@@ -114,7 +126,7 @@ async function refreshSpriteList(unsetSelectedSprite = true) {
   })
 }
 
-async function saveSprite() {
+function saveSprite() {
   if (!selectedSprite.value) {
     console.error('No sprite selected')
     return
@@ -124,27 +136,25 @@ async function saveSprite() {
     id: selectedSprite.value.id,
     name: spriteName.value,
     spriteActions:
-        spriteActions.value?.map((action) => {
+      spriteActions.value?.map((action) => {
-          return {
+        return {
-            action: action.action,
+          action: action.action,
-            sprites: action.sprites,
+          sprites: action.sprites,
-            originX: action.originX,
+          originX: action.originX,
-            originY: action.originY,
+          originY: action.originY,
-            frameRate: action.frameRate,
+          frameRate: action.frameRate,
-            frameWidth: action.frameWidth,
+          frameWidth: action.frameWidth,
-            frameHeight: action.frameHeight
+          frameHeight: action.frameHeight
-          }
+        }
-        }) ?? []
+      }) ?? []
   }
 
-  socketManager.emit(SocketEvent.GM_SPRITE_UPDATE, updatedSprite, async (response: boolean) => {
+  gameStore.connection?.emit('gm:sprite:update', updatedSprite, (response: boolean) => {
     if (!response) {
       console.error('Failed to save sprite')
       return
     }
-
+    refreshSpriteList(false)
-    await downloadCache('sprites', new SpriteStorage())
-    await refreshSpriteList(false)
   })
 }
 
@@ -175,69 +185,39 @@ function sortSpriteActions(actions: SpriteAction[]): SpriteAction[] {
   return [...actions].sort((a, b) => a.action.localeCompare(b.action))
 }
 
-function openEditorModal(action: SpriteAction) {
+function openPreviewModal(action: SpriteAction) {
-  const newOpenEditors = new Map(openEditors.value)
+  selectedAction.value = action
-  newOpenEditors.set(action.id, { action, isOpen: true })
+  isModalOpen.value = true
-  openEditors.value = newOpenEditors
 }
 
-function updateFrameRate(action: SpriteAction, value: number) {
+function updateFrameRate(value: number) {
-  console.log('update frame rate', action)
+  if (selectedAction.value) {
-  action.frameRate = value
+    selectedAction.value.frameRate = value
-}
-
-function handleEditorModalClose(action: SpriteAction, isOpen: boolean) {
-  if (isOpen) return
-  const newOpenEditors = new Map(openEditors.value)
-  newOpenEditors.delete(action.id)
-  openEditors.value = newOpenEditors
-}
-
-function handleTempOffsetChange(action: SpriteAction, index: number, offset: { x: number; y: number }) {
-  // Update the temporary offset data for this action
-  const newTempOffsetData = new Map(tempOffsetData.value)
-  newTempOffsetData.set(action.id, { index, offset })
-  tempOffsetData.value = newTempOffsetData
-
-  // Also update the actual sprite data so changes persist
-  if (action.sprites && action.sprites[index]) {
-    action.sprites[index].offset = { ...offset };
   }
 }
 
-function getTempOffsetIndex(action: SpriteAction): number | undefined {
+const tempOffsetData = ref<{ index: number | undefined; offset: { x: number; y: number } | undefined }>({
-  return tempOffsetData.value.get(action.id)?.index
+  index: undefined,
-}
+  offset: undefined
+})
 
-function getTempOffset(action: SpriteAction): { x: number; y: number } | undefined {
+function handleTempOffsetChange(action: SpriteAction, index: number, offset: { x: number; y: number }) {
-  return tempOffsetData.value.get(action.id)?.offset
+  if (selectedAction.value === action) {
+    tempOffsetData.value = { index, offset }
+  }
 }
 
 watch(selectedSprite, (sprite: Sprite | null) => {
   if (!sprite) return
   spriteName.value = sprite.name
   spriteActions.value = sortSpriteActions(sprite.spriteActions)
-  openEditors.value = new Map()
-  tempOffsetData.value = new Map() // Reset temp offset data when sprite changes
 })
 
-interface SpriteImage {
+watch(isModalOpen, (newValue) => {
-  url: string
+  if (!newValue) {
-  offset: {
+    selectedAction.value = null
-    x: number
-    y: number
   }
-}
+})
-
-const imageDimensions = ref<{ [key: number]: { width: number; height: number } }>({})
-
-const updateImageDimensions = (event: Event, index: number) => {
-  const img = event.target as HTMLImageElement
-  imageDimensions.value[index] = {
-    width: img.naturalWidth,
-    height: img.naturalHeight
-  }
-}
 
 onMounted(() => {
   if (!selectedSprite.value) return
@@ -246,4 +226,4 @@ onMounted(() => {
 onBeforeUnmount(() => {
   assetManagerStore.setSelectedSprite(null)
 })
-</script>
+</script>

src/components/gameMaster/assetManager/partials/sprite/SpriteList.vue

@@ -25,9 +25,7 @@
 
 <script setup lang="ts">
 import config from '@/application/config'
-import { SocketEvent } from '@/application/enums'
 import type { Sprite } from '@/application/types'
-import { socketManager } from '@/managers/SocketManager'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useGameStore } from '@/stores/gameStore'
 import { useVirtualList } from '@vueuse/core'
@@ -42,13 +40,13 @@ const hasScrolled = ref(false)
 const elementToScroll = ref()
 
 function newButtonClickHandler() {
-  socketManager.emit(SocketEvent.GM_SPRITE_CREATE, {}, (response: boolean) => {
+  gameStore.connection?.emit('gm:sprite:create', {}, (response: boolean) => {
     if (!response) {
       if (config.environment === 'development') console.error('Failed to create new sprite')
       return
     }
 
-    socketManager.emit(SocketEvent.GM_SPRITE_LIST, {}, (response: Sprite[]) => {
+    gameStore.connection?.emit('gm:sprite:list', {}, (response: Sprite[]) => {
       assetManagerStore.setSpriteList(response)
     })
   })
@@ -87,7 +85,7 @@ function toTop() {
 }
 
 onMounted(() => {
-  socketManager.emit(SocketEvent.GM_SPRITE_LIST, {}, (response: Sprite[]) => {
+  gameStore.connection?.emit('gm:sprite:list', {}, (response: Sprite[]) => {
     assetManagerStore.setSpriteList(response)
   })
 })

src/components/gameMaster/assetManager/partials/sprite/partials/SpriteEditor.vue

@@ -1,366 +0,0 @@
-<template>
-  <Modal :is-modal-open="isModalOpen" :modal-width="700" :modal-height="330" :can-full-screen="true" bg-style="none" @modal:close="closeModal">
-    <template #modalHeader>
-      <h3 class="m-0 font-medium shrink-0 text-white">Sprite editor</h3>
-    </template>
-    <template #modalBody>
-      <div class="m-4 flex gap-4 h-full">
-        <!-- Settings -->
-        <div class="w-80 h-full flex flex-col overflow-y-auto">
-          <div class="flex flex-col gap-4">
-            <div class="flex flex-col">
-              <label class="block mb-1 text-white text-sm">Frame Rate: {{ frameRate }} FPS</label>
-              <div class="text-xs font-default text-gray-400 mb-1">Duration: {{ totalDuration }}s</div>
-              <input type="range" v-model.number="localFrameRate" min="0" max="60" step="1" class="w-full accent-cyan-500" @input="updateFrameRate" />
-            </div>
-            <div class="flex flex-col">
-              <label class="block mb-1 text-white text-sm">Frame: {{ currentFrame + 1 }} of {{ sprites.length }}</label>
-              <input type="range" v-model.number="currentFrame" :min="0" :max="sprites.length - 1" step="1" class="w-full accent-cyan-500" @input="stopAnimation" />
-            </div>
-            <div class="flex flex-col">
-              <label class="block mb-1 text-white text-sm">Zoom: {{ zoomLevel }}%</label>
-              <input type="range" v-model.number="zoomLevel" min="10" max="600" step="10" class="w-full accent-cyan-500" />
-            </div>
-          </div>
-          <div class="mt-6 space-y-2">
-            <button @click="toggleAnimation" class="px-3 py-1 bg-cyan-600 hover:bg-cyan-700 text-white rounded transition-colors w-full">
-              {{ isAnimating ? 'Pause' : 'Play' }}
-            </button>
-            <button @click="toggleReferenceSprites" class="px-3 py-1 bg-cyan-600 hover:bg-cyan-700 text-white rounded transition-colors w-full">
-              {{ showReferenceSprites ? 'Hide References' : 'Show References' }}
-            </button>
-          </div>
-          <div class="mt-6">
-            <form class="flex gap-2.5 flex-wrap" @submit.prevent="">
-              <div class="relative flex py-5 items-center">
-                <div class="flex-grow border-t border-gray-400"></div>
-                <span class="flex-shrink mx-4 text-gray-400">Sprite action</span>
-                <div class="flex-grow border-solid border-gray-200"></div>
-              </div>
-              <div class="form-field-full">
-                <label for="action">Name</label>
-                <input class="input-field" type="text" name="action" placeholder="Action" />
-              </div>
-              <div class="form-field-half">
-                <label for="origin-x">Origin X</label>
-                <input class="input-field" type="number" step="any" name="origin-x" placeholder="Origin X" />
-              </div>
-              <div class="form-field-half">
-                <label for="origin-y">Origin Y</label>
-                <input class="input-field" type="number" step="any" name="origin-y" placeholder="Origin Y" />
-              </div>
-              <div class="relative flex py-5 items-center">
-                <div class="flex-grow border-t border-gray-400"></div>
-                <span class="flex-shrink mx-4 text-gray-400">Sprite action image</span>
-                <div class="flex-grow border-t border-gray-400"></div>
-              </div>
-              <div class="form-field-half">
-                <label for="offset-x">Offset X</label>
-                <input class="input-field" type="number" step="1" v-model.number="offsetXModel" :disabled="isAnimating" />
-              </div>
-              <div class="form-field-half">
-                <label for="offset-y">Offset Y</label>
-                <input class="input-field" type="number" step="1" v-model.number="offsetYModel" :disabled="isAnimating" />
-              </div>
-              <div class="form-field-full">
-                <label for="frame-speed">Frame rate</label>
-                <input class="input-field" type="number" step="any" name="frame-speed" placeholder="Frame rate" />
-              </div>
-            </form>
-          </div>
-        </div>
-        <!-- Sprite thumbnails -->
-        <div class="flex-1 flex flex-col h-full">
-          <div class="bg-gray-800 border-solid border-white/10 rounded flex-grow mb-2 relative overflow-hidden" @mousedown="startDrag" @mousemove="onDrag" @mouseup="stopDrag" @mouseleave="stopDrag">
-            <!-- Background reference sprites (semi-transparent) -->
-            <img
-                v-for="(sprite, index) in spritesWithTempOffset"
-                :key="`bg-${index}`"
-                :src="sprite.url"
-                alt="Reference sprite"
-                v-show="index !== currentFrame && showReferenceSprites"
-                :style="{
-                position: 'absolute',
-                left: `${(sprite.offset?.x || 0) * (zoomLevel / 100)}px`,
-                bottom: `${(sprite.offset?.y || 0) * (zoomLevel / 100)}px`,
-                opacity: 0.3,
-                transform: `scale(${zoomLevel / 100})`,
-                transformOrigin: 'bottom left',
-                pointerEvents: 'none'
-              }"
-            />
-            <!-- Current sprite (draggable) -->
-            <img
-                v-for="(sprite, index) in spritesWithTempOffset"
-                :key="index"
-                :src="sprite.url"
-                alt="Sprite"
-                :class="{ 'cursor-move': currentFrame === index }"
-                :style="{
-                position: 'absolute',
-                left: `${(sprite.offset?.x || 0) * (zoomLevel / 100)}px`,
-                bottom: `${(sprite.offset?.y || 0) * (zoomLevel / 100)}px`,
-                display: currentFrame === index ? 'block' : 'none',
-                transform: `scale(${zoomLevel / 100})`,
-                transformOrigin: 'bottom left',
-                userSelect: 'none',
-                pointerEvents: currentFrame === index ? 'auto' : 'none'
-              }"
-                @dragstart.prevent
-            />
-          </div>
-          <div class="bg-gray-800 p-2 overflow-x-auto border-solid border-white/10 rounded mb-8 h-24 min-h-16">
-            <div class="flex gap-2">
-              <div
-                  v-for="(sprite, index) in sprites"
-                  :key="`thumb-${index}`"
-                  class="relative cursor-pointer border-solid transition-all duration-200 rounded flex-shrink-0 p-3 px-12"
-                  :class="currentFrame === index ? 'border-cyan-600 bg-cyan-500/10' : 'border-transparent hover:border-white/30'"
-                  @click="selectFrame(index)"
-              >
-                <img :src="sprite.url" alt="Sprite thumbnail" class="h-16 w-auto object-contain rounded" />
-                <div class="absolute top-0 right-0 bg-gray-400 text-white text-xs font-default px-1 rounded-bl">
-                  {{ index + 1 }}
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </template>
-  </Modal>
-</template>
-
-<script setup lang="ts">
-import type { Sprite, SpriteImage } from '@/application/types'
-import Modal from '@/components/utilities/Modal.vue'
-import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
-
-const props = defineProps<{
-  sprite: Sprite
-  sprites: SpriteImage[]
-  frameRate: number
-  isModalOpen?: boolean
-  tempOffsetIndex?: number
-  tempOffset?: { x: number; y: number }
-}>()
-
-const emit = defineEmits<{
-  (e: 'update:frameRate', value: number): void
-  (e: 'update:isModalOpen', value: boolean): void
-  (e: 'update:tempOffset', index: number, offset: { x: number; y: number }): void
-}>()
-
-const currentFrame = ref(0)
-const localFrameRate = ref(props.frameRate)
-const zoomLevel = ref(100)
-const isAnimating = ref(false)
-const isDragging = ref(false)
-const startDragPos = ref({ x: 0, y: 0 })
-const currentOffset = ref({ x: 0, y: 0 })
-let animationInterval: number | null = null
-
-const totalDuration = computed(() => {
-  if (props.frameRate <= 0) return 0
-  return (props.sprites.length / props.frameRate).toFixed(2)
-})
-
-const spritesWithTempOffset = computed(() => {
-  return props.sprites.map((sprite, index) => {
-    if (index === props.tempOffsetIndex && props.tempOffset) {
-      return { ...sprite, offset: props.tempOffset }
-    }
-    return sprite
-  })
-})
-
-const currentSprite = computed(() => {
-  if (currentFrame.value >= 0 && currentFrame.value < spritesWithTempOffset.value.length) {
-    return spritesWithTempOffset.value[currentFrame.value]
-  }
-  return null
-})
-
-// Create computed properties with getters and setters for two-way binding
-const offsetXModel = computed({
-  get: () => currentSprite.value?.offset?.x || 0,
-  set: (value) => {
-    if (isAnimating.value) return
-    const newOffset = {
-      x: value,
-      y: currentSprite.value?.offset?.y || 0
-    }
-    emit('update:tempOffset', currentFrame.value, newOffset)
-  }
-})
-
-const offsetYModel = computed({
-  get: () => currentSprite.value?.offset?.y || 0,
-  set: (value) => {
-    if (isAnimating.value) return
-    const newOffset = {
-      x: currentSprite.value?.offset?.x || 0,
-      y: value
-    }
-    emit('update:tempOffset', currentFrame.value, newOffset)
-  }
-})
-
-// Toggle for showing reference sprites
-const showReferenceSprites = ref(true)
-
-function updateAnimation() {
-  stopAnimation()
-  if (props.frameRate <= 0 || props.sprites.length === 0) {
-    currentFrame.value = 0
-    return
-  }
-
-  if (isAnimating.value) {
-    animationInterval = window.setInterval(() => {
-      currentFrame.value = (currentFrame.value + 1) % props.sprites.length
-    }, 1000 / props.frameRate)
-  }
-}
-
-function toggleAnimation() {
-  isAnimating.value = !isAnimating.value
-  if (isAnimating.value) {
-    updateAnimation()
-  } else {
-    stopAnimation()
-  }
-}
-
-function stopAnimation() {
-  if (animationInterval) {
-    clearInterval(animationInterval)
-    animationInterval = null
-  }
-}
-
-function selectFrame(index: number) {
-  currentFrame.value = index
-  stopAnimation()
-  isAnimating.value = false
-}
-
-function updateFrameRate() {
-  emit('update:frameRate', localFrameRate.value)
-}
-
-function closeModal() {
-  emit('update:isModalOpen', false)
-}
-
-function startDrag(event: MouseEvent) {
-  if (isAnimating.value) return
-
-  const previewContainer = event.currentTarget as HTMLElement
-  const rect = previewContainer.getBoundingClientRect()
-
-  // Store initial mouse position
-  startDragPos.value = {
-    x: event.clientX,
-    y: event.clientY
-  }
-
-  // Store current offset
-  if (currentSprite.value && currentSprite.value.offset) {
-    currentOffset.value = {
-      x: currentSprite.value.offset.x,
-      y: currentSprite.value.offset.y
-    }
-  } else {
-    currentOffset.value = { x: 0, y: 0 }
-  }
-
-  isDragging.value = true
-}
-
-function onDrag(event: MouseEvent) {
-  if (!isDragging.value) return
-
-  // Calculate the difference from the start position
-  const deltaX = event.clientX - startDragPos.value.x
-  const deltaY = startDragPos.value.y - event.clientY // Inverted for bottom positioning
-
-  // Apply the zoom factor to the delta
-  // This ensures that the movement in screen pixels is converted to the correct
-  // number of pixels at the sprite's natural size, regardless of zoom level
-  const zoomFactor = 100 / zoomLevel.value
-  const scaledDeltaX = deltaX * zoomFactor
-  const scaledDeltaY = deltaY * zoomFactor
-
-  // Calculate new offset
-  // These offsets are in the sprite's natural coordinate space (as if zoom was 100%)
-  const newOffset = {
-    x: currentOffset.value.x + scaledDeltaX,
-    y: currentOffset.value.y + scaledDeltaY
-  }
-
-  // Emit the new offset
-  emit('update:tempOffset', currentFrame.value, newOffset)
-}
-
-function stopDrag() {
-  if (isDragging.value && currentSprite.value?.offset) {
-    // Ensure the final offset is applied when dragging stops
-    emit('update:tempOffset', currentFrame.value, {
-      x: currentSprite.value.offset.x,
-      y: currentSprite.value.offset.y
-    })
-  }
-  isDragging.value = false
-}
-
-function toggleReferenceSprites() {
-  showReferenceSprites.value = !showReferenceSprites.value
-}
-
-function updateOffset(event: Event, axis: 'x' | 'y') {
-  if (isAnimating.value) return
-
-  const input = event.target as HTMLInputElement
-  const value = parseInt(input.value) || 0
-
-  if (currentSprite.value && currentSprite.value.offset) {
-    const newOffset = { ...currentSprite.value.offset }
-    newOffset[axis] = value
-    emit('update:tempOffset', currentFrame.value, newOffset)
-  }
-}
-
-watch(
-    () => props.frameRate,
-    (newValue) => {
-      localFrameRate.value = newValue
-      updateAnimation()
-    },
-    { immediate: true }
-)
-
-watch(() => props.sprites, updateAnimation, { immediate: true })
-
-watch(
-    () => isAnimating.value,
-    (newValue) => {
-      if (newValue) {
-        updateAnimation()
-      } else {
-        stopAnimation()
-      }
-    }
-)
-
-onMounted(() => {
-  isAnimating.value = props.frameRate > 0
-  if (isAnimating.value) {
-    updateAnimation()
-  }
-})
-
-onUnmounted(() => {
-  stopAnimation()
-})
-</script>

src/components/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue

@@ -0,0 +1,185 @@
+<template>
+  <div class="flex flex-wrap gap-3">
+    <div v-for="(image, index) in modelValue" :key="index" class="h-20 w-20 p-4 bg-gray-300 bg-opacity-50 rounded text-center relative group cursor-move" draggable="true" @dragstart="dragStart($event, index)" @dragover.prevent @dragenter.prevent @drop="drop($event, index)">
+      <img :src="image.url" class="max-w-full max-h-full object-contain pointer-events-none" alt="Uploaded image" @load="updateImageDimensions($event, index)" />
+      <div v-if="imageDimensions[index]" class="absolute bottom-1 right-1 bg-black/50 text-white text-xs px-1 py-0.5 rounded transition-opacity font-default">{{ imageDimensions[index].width }}x{{ imageDimensions[index].height }}</div>
+      <div class="absolute top-1 left-1 flex-row space-y-1">
+        <button @click.stop="deleteImage(index)" class="bg-red-500 text-white rounded-full w-6 h-6 flex items-center justify-center cursor-pointer opacity-0 group-hover:opacity-100 transition-opacity" aria-label="Delete image">
+          <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+          </svg>
+        </button>
+        <button @click.stop="openOffsetModal(index)" class="bg-blue-500 text-white rounded-full w-6 h-6 flex items-center justify-center cursor-pointer opacity-0 group-hover:opacity-100 transition-opacity" aria-label="Scope image">
+          <svg width="50px" height="50px" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path d="M8.29289 3.70711L1 11V15H5L12.2929 7.70711L8.29289 3.70711Z" fill="white" />
+            <path d="M9.70711 2.29289L13.7071 6.29289L15.1716 4.82843C15.702 4.29799 16 3.57857 16 2.82843C16 1.26633 14.7337 0 13.1716 0C12.4214 0 11.702 0.297995 11.1716 0.828428L9.70711 2.29289Z" fill="white" />
+          </svg>
+        </button>
+      </div>
+
+      <Modal :is-modal-open="selectedImageIndex === index" :modal-width="300" :modal-height="210" :is-resizable="false" bg-style="none" @modal:close="closeOffsetModal">
+        <template #modalHeader>
+          <h3 class="m-0 font-medium shrink-0 text-white">Action offset ({{ selectedImageIndex }})</h3>
+        </template>
+        <template #modalBody>
+          <div class="m-4">
+            <form method="post" @submit.prevent="saveOffset(index)" class="inline">
+              <div class="gap-2.5 flex flex-wrap">
+                <div class="form-field-half">
+                  <label for="offsetX">Offset X</label>
+                  <input class="input-field max-w-64" v-model="tempOffset.x" name="offsetX" id="offsetX" type="number" />
+                </div>
+                <div class="form-field-half">
+                  <label for="offsetY">Offset Y</label>
+                  <input class="input-field max-w-64" v-model="tempOffset.y" name="offsetY" id="offsetY" type="number" />
+                </div>
+              </div>
+              <button class="btn-cyan px-4 py-1.5 min-w-24" type="submit">Save</button>
+            </form>
+          </div>
+        </template>
+      </Modal>
+    </div>
+    <div class="h-20 w-20 p-4 bg-gray-200 bg-opacity-50 rounded justify-center items-center flex hover:cursor-pointer" @click="triggerFileInput" @drop.prevent="onDrop" @dragover.prevent>
+      <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 invert" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6" />
+      </svg>
+    </div>
+  </div>
+  <input type="file" ref="fileInput" @change="onFileChange" multiple accept="image/png" class="hidden" />
+</template>
+
+<script setup lang="ts">
+import Modal from '@/components/utilities/Modal.vue'
+import { ref, watch } from 'vue'
+
+interface SpriteImage {
+  url: string
+  offset: {
+    x: number
+    y: number
+  }
+}
+
+interface Props {
+  modelValue: SpriteImage[]
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  modelValue: () => []
+})
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: SpriteImage[]): void
+  (e: 'close'): void
+  (e: 'tempOffsetChange', index: number, offset: { x: number; y: number }): void
+}>()
+
+const fileInput = ref<HTMLInputElement | null>(null)
+const draggedIndex = ref<number | null>(null)
+const selectedImageIndex = ref<number | null>(null)
+const tempOffset = ref({ x: 0, y: 0 })
+
+const triggerFileInput = () => {
+  fileInput.value?.click()
+}
+
+const onFileChange = (event: Event) => {
+  const target = event.target as HTMLInputElement
+  if (target.files) {
+    handleFiles(target.files)
+  }
+}
+
+const onDrop = (event: DragEvent) => {
+  if (event.dataTransfer?.files) {
+    handleFiles(event.dataTransfer.files)
+  }
+}
+
+const handleFiles = (files: FileList) => {
+  Array.from(files).forEach((file) => {
+    if (!file.type.startsWith('image/')) {
+      return
+    }
+
+    const reader = new FileReader()
+    reader.onload = (e) => {
+      if (typeof e.target?.result === 'string') {
+        const newImage: SpriteImage = {
+          url: e.target.result,
+          offset: { x: 0, y: 0 }
+        }
+        updateImages([...props.modelValue, newImage])
+      }
+    }
+    reader.readAsDataURL(file)
+  })
+}
+
+const updateImages = (newImages: SpriteImage[]) => {
+  emit('update:modelValue', newImages)
+}
+
+const deleteImage = (index: number) => {
+  const newImages = [...props.modelValue]
+  newImages.splice(index, 1)
+  updateImages(newImages)
+}
+
+const dragStart = (event: DragEvent, index: number) => {
+  draggedIndex.value = index
+  if (event.dataTransfer) {
+    event.dataTransfer.effectAllowed = 'move'
+    event.dataTransfer.dropEffect = 'move'
+  }
+}
+
+const drop = (event: DragEvent, dropIndex: number) => {
+  event.preventDefault()
+  if (draggedIndex.value !== null && draggedIndex.value !== dropIndex) {
+    const newImages = [...props.modelValue]
+    const [reorderedItem] = newImages.splice(draggedIndex.value, 1)
+    newImages.splice(dropIndex, 0, reorderedItem)
+    updateImages(newImages)
+  }
+  draggedIndex.value = null
+}
+
+const openOffsetModal = (index: number) => {
+  selectedImageIndex.value = index
+  tempOffset.value = { ...props.modelValue[index].offset }
+}
+
+const closeOffsetModal = () => {
+  selectedImageIndex.value = null
+}
+
+const saveOffset = (index: number) => {
+  const newImages = [...props.modelValue]
+  newImages[index] = {
+    ...newImages[index],
+    offset: { ...tempOffset.value }
+  }
+  updateImages(newImages)
+  closeOffsetModal()
+}
+
+const onOffsetChange = () => {
+  if (selectedImageIndex.value !== null) {
+    emit('tempOffsetChange', selectedImageIndex.value, tempOffset.value)
+  }
+}
+
+watch(tempOffset, onOffsetChange, { deep: true })
+
+const imageDimensions = ref<{ [key: number]: { width: number; height: number } }>({})
+
+const updateImageDimensions = (event: Event, index: number) => {
+  const img = event.target as HTMLImageElement
+  imageDimensions.value[index] = {
+    width: img.naturalWidth,
+    height: img.naturalHeight
+  }
+}
+</script>

src/components/gameMaster/assetManager/partials/sprite/partials/SpritePreview.vue

@@ -0,0 +1,146 @@
+<template>
+  <Modal :is-modal-open="isModalOpen" :modal-width="700" :modal-height="330" bg-style="none" @modal:close="closeModal">
+    <template #modalHeader>
+      <h3 class="m-0 font-medium shrink-0 text-white">View sprite</h3>
+    </template>
+    <template #modalBody>
+      <div class="m-4 flex gap-8">
+        <div class="relative">
+          <div
+            class="sprite-container bg-gray-800"
+            :style="{
+              width: `${maxWidth}px`,
+              height: `${maxHeight}px`,
+              position: 'relative',
+              overflow: 'hidden'
+            }"
+          >
+            <img
+              v-for="(sprite, index) in spritesWithTempOffset"
+              :key="index"
+              :src="sprite.url"
+              alt="Sprite"
+              :style="{
+                position: 'absolute',
+                left: `${sprite.offset?.x || 0}px`,
+                bottom: `${sprite.offset?.y || 0}px`,
+                display: currentFrame === index ? 'block' : 'none',
+                transform: `scale(${zoomLevel / 100})`,
+                transformOrigin: 'bottom left'
+              }"
+              @load="updateContainerSize"
+            />
+          </div>
+        </div>
+        <div class="flex flex-col justify-center gap-8 flex-1">
+          <div class="flex flex-col">
+            <label class="block mb-2 text-white">Frame Rate: {{ frameRate }} FPS</label>
+            <input type="range" v-model.number="localFrameRate" min="0" max="60" step="1" class="w-full accent-cyan-500" @input="updateFrameRate" />
+          </div>
+          <div class="flex flex-col">
+            <label class="block mb-2 text-white">Frame: {{ currentFrame + 1 }} of {{ sprites.length }}</label>
+            <input type="range" v-model.number="currentFrame" :min="0" :max="sprites.length - 1" step="1" class="w-full accent-cyan-500" @input="stopAnimation" />
+          </div>
+          <div class="flex flex-col">
+            <label class="block mb-2 text-white">Zoom: {{ zoomLevel }}%</label>
+            <input type="range" v-model.number="zoomLevel" min="10" max="200" step="10" class="w-full accent-cyan-500" />
+          </div>
+        </div>
+      </div>
+    </template>
+  </Modal>
+</template>
+
+<script setup lang="ts">
+import type { SpriteImage } from '@/application/types'
+import Modal from '@/components/utilities/Modal.vue'
+import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
+
+const props = defineProps<{
+  sprites: SpriteImage[]
+  frameRate: number
+  isModalOpen?: boolean
+  tempOffsetIndex?: number
+  tempOffset?: { x: number; y: number }
+}>()
+
+const emit = defineEmits<{
+  (e: 'update:frameRate', value: number): void
+  (e: 'update:isModalOpen', value: boolean): void
+}>()
+
+const currentFrame = ref(0)
+const maxWidth = ref(250)
+const maxHeight = ref(250)
+const localFrameRate = ref(props.frameRate)
+const zoomLevel = ref(100)
+let animationInterval: number | null = null
+
+const spritesWithTempOffset = computed(() => {
+  return props.sprites.map((sprite, index) => {
+    if (index === props.tempOffsetIndex && props.tempOffset) {
+      return { ...sprite, offset: props.tempOffset }
+    }
+    return sprite
+  })
+})
+
+function updateContainerSize(event: Event) {
+  const img = event.target as HTMLImageElement
+  maxWidth.value = Math.max(maxWidth.value, img.naturalWidth)
+  maxHeight.value = Math.max(maxHeight.value, img.naturalHeight)
+}
+
+function updateAnimation() {
+  stopAnimation()
+  if (props.frameRate <= 0 || props.sprites.length === 0) {
+    currentFrame.value = 0
+    return
+  }
+
+  animationInterval = window.setInterval(() => {
+    currentFrame.value = (currentFrame.value + 1) % props.sprites.length
+  }, 1000 / props.frameRate)
+}
+
+function stopAnimation() {
+  if (animationInterval) {
+    clearInterval(animationInterval)
+    animationInterval = null
+  }
+}
+
+function updateFrameRate() {
+  emit('update:frameRate', localFrameRate.value)
+}
+
+function closeModal() {
+  emit('update:isModalOpen', false)
+}
+
+watch(
+  () => props.frameRate,
+  (newValue) => {
+    localFrameRate.value = newValue
+    updateAnimation()
+  },
+  { immediate: true }
+)
+
+watch(() => props.sprites, updateAnimation, { immediate: true })
+
+onMounted(() => {
+  updateAnimation()
+})
+
+onUnmounted(() => {
+  stopAnimation()
+})
+</script>
+
+<style scoped>
+.sprite-container {
+  border: 1px solid rgba(255, 255, 255, 0.1);
+  border-radius: 4px;
+}
+</style>

src/components/gameMaster/assetManager/partials/tile/TileDetails.vue

@@ -24,16 +24,16 @@
 
 <script setup lang="ts">
 import config from '@/application/config'
-import { SocketEvent } from '@/application/enums'
 import type { Tile } from '@/application/types'
-import { downloadCache } from '@/application/utilities'
 import ChipsInput from '@/components/forms/ChipsInput.vue'
-import { socketManager } from '@/managers/SocketManager'
 import { TileStorage } from '@/storage/storages'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
-import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
+import { useGameStore } from '@/stores/gameStore'
+import { computed, onBeforeUnmount, onMounted, ref, toRaw, watch } from 'vue'
 
+const gameStore = useGameStore()
 const assetManagerStore = useAssetManagerStore()
+const tileStorage = new TileStorage()
 
 const selectedTile = computed(() => assetManagerStore.selectedTile)
 
@@ -56,19 +56,18 @@ watch(selectedTile, (tile: Tile | null) => {
 })
 
 async function deleteTile() {
-  socketManager.emit(SocketEvent.GM_TILE_DELETE, { id: selectedTile.value?.id }, async (response: boolean) => {
+  gameStore.connection?.emit('gm:tile:delete', { id: selectedTile.value?.id }, async (response: boolean) => {
     if (!response) {
       console.error('Failed to delete tile')
       return
     }
-
+    await tileStorage.delete(selectedTile.value!.id)
-    await downloadCache('tiles', new TileStorage())
+    refreshTileList()
-    await refreshTileList()
   })
 }
 
-async function refreshTileList(unsetSelectedTile = true) {
+function refreshTileList(unsetSelectedTile = true) {
-  socketManager.emit(SocketEvent.GM_TILE_LIST, {}, (response: Tile[]) => {
+  gameStore.connection?.emit('gm:tile:list', {}, (response: Tile[]) => {
     assetManagerStore.setTileList(response)
 
     if (unsetSelectedTile) {
@@ -77,27 +76,25 @@ async function refreshTileList(unsetSelectedTile = true) {
   })
 }
 
-async function saveTile() {
+function saveTile() {
   if (!selectedTile.value) {
     console.error('No tile selected')
     return
   }
 
-  socketManager.emit(
+  gameStore.connection?.emit(
     'gm:tile:update',
     {
       id: selectedTile.value.id,
       name: tileName.value,
       tags: tileTags.value
     },
-    async (response: boolean) => {
+    (response: boolean) => {
       if (!response) {
         console.error('Failed to save tile')
         return
       }
-
+      refreshTileList(false)
-      await downloadCache('tiles', new TileStorage())
-      await refreshTileList(false)
     }
   )
 }

src/components/gameMaster/assetManager/partials/tile/TileList.vue

@@ -29,9 +29,7 @@
 
 <script setup lang="ts">
 import config from '@/application/config'
-import { SocketEvent } from '@/application/enums'
 import type { Tile } from '@/application/types'
-import { socketManager } from '@/managers/SocketManager'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useGameStore } from '@/stores/gameStore'
 import { useVirtualList } from '@vueuse/core'
@@ -49,13 +47,13 @@ const elementToScroll = ref()
 const handleFileUpload = (e: Event) => {
   const files = (e.target as HTMLInputElement).files
   if (!files) return
-  socketManager.emit(SocketEvent.GM_TILE_UPLOAD, files, (response: boolean) => {
+  gameStore.connection?.emit('gm:tile:upload', files, (response: boolean) => {
     if (!response) {
       if (config.environment === 'development') console.error('Failed to upload tile')
       return
     }
 
-    socketManager.emit(SocketEvent.GM_TILE_LIST, {}, (response: Tile[]) => {
+    gameStore.connection?.emit('gm:tile:list', {}, (response: Tile[]) => {
       assetManagerStore.setTileList(response)
     })
   })
@@ -94,7 +92,7 @@ function toTop() {
 }
 
 onMounted(() => {
-  socketManager.emit(SocketEvent.GM_TILE_LIST, {}, (response: Tile[]) => {
+  gameStore.connection?.emit('gm:tile:list', {}, (response: Tile[]) => {
     assetManagerStore.setTileList(response)
   })
 })

src/components/gameMaster/mapEditor/Map.vue

@@ -1,142 +1,30 @@
 <template>
-  <MapTiles ref="mapTiles" @createCommand="addCommand" v-if="tileMap && tileMapLayer" :tileMap :tileMapLayer />
+  <MapTiles ref="mapTiles" v-if="tileMap && tileMapLayer" :tileMap :tileMapLayer />
-  <PlacedMapObjects ref="mapObjects" @update="updateMapObjects" @updateAndCommit="updateAndCommit" @pauseObjectTracking="pause" @resumeObjectTracking="resume" v-if="tileMap && tileMapLayer" :tileMap :tileMapLayer />
+  <PlacedMapObjects ref="mapObjects" v-if="tileMap && tileMapLayer" :tileMap :tileMapLayer />
-  <MapEventTiles ref="eventTiles" @createCommand="addCommand" v-if="tileMap" :tileMap />
+  <MapEventTiles ref="eventTiles" v-if="tileMap" :tileMap />
 </template>
 
 <script setup lang="ts">
-import type { MapEventTile, Map as MapT, PlacedMapObject as PlacedMapObjectT } from '@/application/types'
 import MapEventTiles from '@/components/gameMaster/mapEditor/mapPartials/MapEventTiles.vue'
 import MapTiles from '@/components/gameMaster/mapEditor/mapPartials/MapTiles.vue'
 import PlacedMapObjects from '@/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue'
 import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
-import { cloneArray, createTileLayer, createTileMap, placeTiles } from '@/services/mapService'
+import { createTileLayer, createTileMap } from '@/services/mapService'
 import { TileStorage } from '@/storage/storages'
-import { useRefHistory } from '@vueuse/core'
 import { useScene } from 'phavuer'
-import { onBeforeUnmount, onMounted, onUnmounted, ref, shallowRef, useTemplateRef, watch } from 'vue'
+import { onBeforeUnmount, onMounted, onUnmounted, shallowRef, useTemplateRef } from 'vue'
 
 const tileMap = shallowRef<Phaser.Tilemaps.Tilemap>()
 const tileMapLayer = shallowRef<Phaser.Tilemaps.TilemapLayer>()
 
 const mapEditor = useMapEditorComposable()
+
 const scene = useScene()
 
 const mapTiles = useTemplateRef('mapTiles')
 const mapObjects = useTemplateRef('mapObjects')
 const eventTiles = useTemplateRef('eventTiles')
 
-//Record of commands
-let commandStack: (EditorCommand | number)[] = []
-let commandIndex = ref(0)
-
-let originTiles: string[][] = []
-let originEventTiles: MapEventTile[] = []
-let originObjects = ref<PlacedMapObjectT[]>(mapEditor.currentMap.value?.placedMapObjects ?? [])
-
-const { undo, redo, commit, pause, resume, canUndo, canRedo } = useRefHistory(originObjects, { deep: true, capacity: 9 })
-
-//Command Pattern basic interface, extended to store what elements have been changed by each edit
-export interface EditorCommand {
-  apply: (elements: any[]) => any[]
-  type: 'tile' | 'map_object' | 'event_tile'
-  operation: 'draw' | 'erase' | 'clear'
-}
-
-function applyCommands(tiles: any[], ...commands: EditorCommand[]): any[] {
-  let tileVersion = cloneArray(tiles)
-  for (let command of commands) {
-    tileVersion = command.apply(tileVersion)
-  }
-  return tileVersion
-}
-
-watch(
-  () => mapEditor.shouldClearTiles.value,
-  (shouldClear) => {
-    if (shouldClear && mapEditor.currentMap.value) {
-      mapTiles.value!.clearTiles()
-      eventTiles.value!.clearTiles()
-      mapEditor.currentMap.value.placedMapObjects = []
-      mapEditor.currentMap.value.mapEventTiles = []
-      updateAndCommit(mapEditor.currentMap.value)
-      mapEditor.resetClearTilesFlag()
-    }
-  }
-)
-
-function update(commands: (EditorCommand | number)[]) {
-  if (!mapEditor.currentMap.value) return
-
-  if (commandStack.length >= 9) {
-    if (typeof commandStack[0] !== 'number') {
-      const base = commandStack.shift() as EditorCommand
-      if (base.operation !== 'clear') {
-        switch (base.type) {
-          case 'tile':
-            originTiles = base.apply(originTiles) as string[][]
-            break
-          case 'event_tile':
-            originEventTiles = base.apply(originEventTiles) as MapEventTile[]
-            break
-        }
-      } else {
-        commandStack.shift()
-      }
-    } else if (typeof commandStack[0] === 'number') {
-      commandStack.shift()
-    }
-  }
-
-  let tileCommands = commands.filter((item) => typeof item !== 'number' && item.type === 'tile') as EditorCommand[]
-  let eventTileCommands = commands.filter((item) => typeof item !== 'number' && item.type === 'event_tile') as EditorCommand[]
-
-  let modifiedTiles = applyCommands(originTiles, ...tileCommands)
-  placeTiles(tileMap.value!, tileMapLayer.value!, modifiedTiles)
-
-  let eventTiles = applyCommands(originEventTiles, ...eventTileCommands)
-
-  mapEditor.currentMap.value.tiles = modifiedTiles
-  mapEditor.currentMap.value.mapEventTiles = eventTiles
-  mapEditor.currentMap.value.placedMapObjects = originObjects.value
-}
-
-function updateMapObjects(map: MapT) {
-  originObjects.value = map.placedMapObjects
-}
-
-function updateAndCommit(map?: MapT) {
-  commandStack = commandStack.slice(0, commandIndex.value)
-  if (map) updateMapObjects(map)
-  commit()
-  commandStack.push(0)
-  commandIndex.value = commandStack.length
-}
-
-function addCommand(command: EditorCommand) {
-  commandStack = commandStack.slice(0, commandIndex.value)
-  commandStack.push(command)
-  commandIndex.value = commandStack.length
-}
-
-function undoEdit() {
-  if (commandIndex.value > 0) {
-    if (typeof commandStack[--commandIndex.value] === 'number' && canUndo) {
-      undo()
-    }
-    update(commandStack.slice(0, commandIndex.value))
-  }
-}
-
-function redoEdit() {
-  if (commandIndex.value <= 9 && commandIndex.value < commandStack.length) {
-    if (typeof commandStack[commandIndex.value++] === 'number' && canRedo) {
-      redo()
-    }
-    update(commandStack.slice(0, commandIndex.value))
-  }
-}
-
 function handlePointerDown(pointer: Phaser.Input.Pointer) {
   if (!mapTiles.value || !mapObjects.value || !eventTiles.value) return
 
@@ -166,12 +54,12 @@ function handlePointerDown(pointer: Phaser.Input.Pointer) {
 function handleKeyDown(event: KeyboardEvent) {
   //CTRL+Y
   if (event.key === 'y' && event.ctrlKey) {
-    redoEdit()
+    mapTiles.value!.redo()
   }
 
   //CTRL+Z
   if (event.key === 'z' && event.ctrlKey) {
-    undoEdit()
+    mapTiles.value!.undo()
   }
 }
 
@@ -182,22 +70,8 @@ function handlePointerMove(pointer: Phaser.Input.Pointer) {
 }
 
 function handlePointerUp(pointer: Phaser.Input.Pointer) {
-  switch (mapEditor.drawMode.value) {
+  if (mapEditor.drawMode.value === 'tile') {
-    case 'tile':
+    mapTiles.value?.finalizeCommand()
-      mapTiles.value!.finalizeCommand()
-      break
-    case 'map_object':
-      if (mapEditor.tool.value === 'pencil' || mapEditor.tool.value === 'eraser') {
-        resume()
-        updateAndCommit()
-      }
-      break
-    case 'teleport':
-      eventTiles.value!.finalizeCommand()
-      break
-    case 'blocking tile':
-      eventTiles.value!.finalizeCommand()
-      break
   }
 }
 
@@ -205,10 +79,6 @@ onMounted(async () => {
   let mapValue = mapEditor.currentMap.value
   if (!mapValue) return
 
-  //Clone
-  originTiles = cloneArray(mapValue.tiles)
-  originEventTiles = cloneArray(mapValue.mapEventTiles)
-
   const tileStorage = new TileStorage()
   const allTiles = await tileStorage.getAll()
   const allTileIds = allTiles.map((tile) => tile.id)
@@ -235,10 +105,6 @@ onUnmounted(() => {
   mapEditor.reset()
 })
 
-setInterval(() => {
-  scene.children.queueDepthSort()
-}, 0.2)
-
 onBeforeUnmount(() => {
   removeEventListener('keydown', handleKeyDown)
 })

src/components/gameMaster/mapEditor/mapPartials/MapEventTiles.vue

@@ -5,69 +5,20 @@
 <script setup lang="ts">
 import { MapEventTileType, type MapEventTile, type Map as MapT, type UUID } from '@/application/types'
 import { uuidv4 } from '@/application/utilities'
-import { type EditorCommand } from '@/components/gameMaster/mapEditor/Map.vue'
 import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
-import { cloneArray, getTile, tileToWorldX, tileToWorldY } from '@/services/mapService'
+import { getTile, tileToWorldX, tileToWorldY } from '@/services/mapService'
 import { Image } from 'phavuer'
+import { shallowRef } from 'vue'
 
 const mapEditor = useMapEditorComposable()
 
-defineExpose({ handlePointer, finalizeCommand, clearTiles })
+defineExpose({ handlePointer })
-
-const emit = defineEmits(['createCommand'])
 
 const props = defineProps<{
   tileMap: Phaser.Tilemaps.Tilemap
 }>()
 
-// *** COMMAND STATE ***
+const tileLayer = shallowRef<Phaser.Tilemaps.TilemapLayer>()
-
-let currentCommand: EventTileCommand | null = null
-
-class EventTileCommand implements EditorCommand {
-  public operation: 'draw' | 'erase' | 'clear' = 'draw'
-  public type: 'event_tile' = 'event_tile'
-  public affectedTiles: MapEventTile[] = []
-
-  apply(elements: MapEventTile[]) {
-    let tileVersion = cloneArray(elements) as MapEventTile[]
-    if (this.operation === 'draw') {
-      tileVersion = tileVersion.concat(this.affectedTiles)
-    } else if (this.operation === 'erase') {
-      tileVersion = tileVersion.filter((v) => !this.affectedTiles.includes(v))
-    } else if (this.operation === 'clear') {
-      tileVersion = []
-    }
-    return tileVersion
-  }
-
-  constructor(operation: 'draw' | 'erase' | 'clear') {
-    this.operation = operation
-  }
-}
-
-function createCommandUpdate(tile?: MapEventTile | null, operation: 'draw' | 'erase' | 'clear' = 'draw') {
-  if (!tile) return
-
-  if (!currentCommand) {
-    currentCommand = new EventTileCommand(operation)
-  }
-
-  //If position is already in, do not proceed
-  for (const priorTile of currentCommand.affectedTiles) {
-    if (priorTile.positionX === tile.positionX && priorTile.positionY == tile.positionY) return
-  }
-
-  currentCommand.affectedTiles.push(tile)
-}
-
-function finalizeCommand() {
-  if (!currentCommand) return
-  emit('createCommand', currentCommand)
-  currentCommand = null
-}
-
-// *** HANDLERS ***
 
 function getImageProps(tile: MapEventTile) {
   return {
@@ -88,17 +39,19 @@ function pencil(pointer: Phaser.Input.Pointer, map: MapT) {
   if (existingEventTile) return
 
   // If teleport, check if there is a selected map
-  if (mapEditor.drawMode.value === 'teleport' && !mapEditor.teleportSettings.value.toMap) return
+  if (mapEditor.drawMode.value === 'teleport' && !mapEditor.teleportSettings.value.toMapId) return
 
   const newEventTile = {
     id: uuidv4() as UUID,
+    mapId: map.id,
+    map: map.id,
     type: mapEditor.drawMode.value === 'blocking tile' ? MapEventTileType.BLOCK : MapEventTileType.TELEPORT,
     positionX: tile.x,
     positionY: tile.y,
     teleport:
       mapEditor.drawMode.value === 'teleport'
         ? {
-            toMap: mapEditor.teleportSettings.value.toMap,
+            toMap: mapEditor.teleportSettings.value.toMapId,
             toPositionX: mapEditor.teleportSettings.value.toPositionX,
             toPositionY: mapEditor.teleportSettings.value.toPositionY,
             toRotation: mapEditor.teleportSettings.value.toRotation
@@ -106,9 +59,7 @@ function pencil(pointer: Phaser.Input.Pointer, map: MapT) {
         : undefined
   }
 
-  createCommandUpdate(newEventTile as MapEventTile, 'draw')
+  map.mapEventTiles.push(newEventTile)
-
-  map.mapEventTiles.push(newEventTile as MapEventTile)
 }
 
 function erase(pointer: Phaser.Input.Pointer, map: MapT) {
@@ -126,8 +77,6 @@ function erase(pointer: Phaser.Input.Pointer, map: MapT) {
     else return
   }
 
-  createCommandUpdate(existingEventTile, 'erase')
-
   // Remove existing event tile
   map.mapEventTiles = map.mapEventTiles.filter((eventTile) => eventTile.id !== existingEventTile.id)
 }
@@ -147,10 +96,4 @@ function handlePointer(pointer: Phaser.Input.Pointer) {
       break
   }
 }
-
-function clearTiles() {
-  if (mapEditor.currentMap.value?.mapEventTiles.length === 0) return
-  createCommandUpdate(null, 'clear')
-  finalizeCommand()
-}
 </script>

src/components/gameMaster/mapEditor/mapPartials/MapTiles.vue

@@ -3,74 +3,59 @@
 </template>
 
 <script setup lang="ts">
-import { type EditorCommand } from '@/components/gameMaster/mapEditor/Map.vue'
 import Controls from '@/components/utilities/Controls.vue'
 import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
-import { cloneArray, createTileArray, getTile, placeTile, placeTiles } from '@/services/mapService'
+import { createTileArray, getTile, placeTile, placeTiles } from '@/services/mapService'
 import { onMounted, ref, watch } from 'vue'
 
 const mapEditor = useMapEditorComposable()
 
-defineExpose({ handlePointer, finalizeCommand, clearTiles })
+defineExpose({ handlePointer, finalizeCommand, undo, redo })
-
-const emit = defineEmits(['createCommand'])
 
 const props = defineProps<{
   tileMap: Phaser.Tilemaps.Tilemap
   tileMapLayer: Phaser.Tilemaps.TilemapLayer
 }>()
 
-// *** COMMAND STATE ***
+class EditorCommand {
-
+  public operation: 'draw' | 'erase' = 'draw'
-let currentCommand: TileCommand | null = null
-
-class TileCommand implements EditorCommand {
-  public operation: 'draw' | 'erase' | 'clear' = 'draw'
-  public type: 'tile' = 'tile'
   public tileName: string = 'blank_tile'
-  public affectedTiles: number[][] = []
+  public affectedTiles: number[][]
 
-  apply(elements: string[][]) {
+  constructor(operation: 'draw' | 'erase', tileName: string) {
-    let tileVersion
-    if (this.operation === 'clear') {
-      tileVersion = createTileArray(props.tileMapLayer.width, props.tileMapLayer.height, 'blank_tile')
-    } else {
-      tileVersion = cloneArray(elements) as string[][]
-      for (const position of this.affectedTiles) {
-        tileVersion[position[1]][position[0]] = this.tileName
-      }
-    }
-    return tileVersion
-  }
-
-  constructor(operation: 'draw' | 'erase' | 'clear', tileName: string) {
     this.operation = operation
     this.tileName = tileName
+    this.affectedTiles = []
   }
 }
 
-function createCommandUpdate(x: number, y: number, tileName: string, operation: 'draw' | 'erase' | 'clear') {
+//Record of commands
-  if (!currentCommand) {
+let commandStack: EditorCommand[] = []
-    currentCommand = new TileCommand(operation, tileName)
+let currentCommand: EditorCommand | null = null
-  }
+let commandIndex = ref(0)
+let originTiles: string[][] = []
 
-  //If position is already in, do not proceed
+function pencil(pointer: Phaser.Input.Pointer) {
-  for (const vec of currentCommand.affectedTiles) {
+  let map = mapEditor.currentMap.value
-    if (vec[0] === x && vec[1] === y) return
+  if (!map) return
-  }
 
-  currentCommand.affectedTiles.push([x, y])
+  // Check if there is a selected tile
+  if (!mapEditor.selectedTile.value) return
+
+  // Check if there is a tile
+  const tile = getTile(props.tileMapLayer, pointer.worldX, pointer.worldY)
+  if (!tile) return
+
+  // Place tile
+  placeTile(props.tileMap, props.tileMapLayer, tile.x, tile.y, mapEditor.selectedTile.value)
+
+  createCommandUpdate(tile.x, tile.y, mapEditor.selectedTile.value, 'draw')
+
+  // Adjust mapEditorStore.map.tiles
+  map.tiles[tile.y][tile.x] = mapEditor.selectedTile.value
 }
 
-function finalizeCommand() {
+function eraser(pointer: Phaser.Input.Pointer) {
-  if (!currentCommand) return
-  emit('createCommand', currentCommand)
-  currentCommand = null
-}
-
-// *** HANDLERS ***
-
-function draw(pointer: Phaser.Input.Pointer, tileName: string) {
   let map = mapEditor.currentMap.value
   if (!map) return
 
@@ -79,12 +64,12 @@ function draw(pointer: Phaser.Input.Pointer, tileName: string) {
   if (!tile) return
 
   // Place tile
-  placeTile(props.tileMap, props.tileMapLayer, tile.x, tile.y, tileName)
+  placeTile(props.tileMap, props.tileMapLayer, tile.x, tile.y, 'blank_tile')
 
-  createCommandUpdate(tile.x, tile.y, tileName, tileName === 'blank_tile' ? 'erase' : 'draw')
+  createCommandUpdate(tile.x, tile.y, 'blank_tile', 'erase')
 
   // Adjust mapEditorStore.map.tiles
-  map.tiles[tile.y][tile.x] = tileName
+  map.tiles[tile.y][tile.x] = 'blank_tile'
 }
 
 function paint(pointer: Phaser.Input.Pointer) {
@@ -128,10 +113,10 @@ function handlePointer(pointer: Phaser.Input.Pointer) {
   // Check if draw mode is tile
   switch (mapEditor.tool.value) {
     case 'pencil':
-      draw(pointer, mapEditor.selectedTile.value!)
+      pencil(pointer)
       break
     case 'eraser':
-      draw(pointer, 'blank_tile')
+      eraser(pointer)
       break
     case 'paint':
       paint(pointer)
@@ -139,19 +124,90 @@ function handlePointer(pointer: Phaser.Input.Pointer) {
   }
 }
 
-// *** LIFECYCLE ***
+function createCommandUpdate(x: number, y: number, tileName: string, operation: 'draw' | 'erase') {
+  if (!currentCommand) {
+    currentCommand = new EditorCommand(operation, tileName)
+  }
 
-function clearTiles() {
+  //If position is already in, do not proceed
-  const tileArray = createTileArray(props.tileMap.width, props.tileMap.height, 'blank_tile')
+  for (const vec of currentCommand.affectedTiles) {
-  placeTiles(props.tileMap, props.tileMapLayer, tileArray)
+    if (vec[0] === x && vec[1] === y) return
-  createCommandUpdate(0, 0, 'blank_tile', 'clear')
+  }
-  finalizeCommand()
+
+  currentCommand.affectedTiles.push([x, y])
 }
 
+function finalizeCommand() {
+  if (!currentCommand) return
+  //Cut the stack so the current edit is the last
+  commandStack = commandStack.slice(0, commandIndex.value)
+  commandStack.push(currentCommand)
+  if (commandStack.length >= 9) {
+    originTiles = applyCommands(originTiles, commandStack.shift()!)
+  }
+
+  commandIndex.value = commandStack.length
+  currentCommand = null
+}
+
+function undo() {
+  if (commandIndex.value > 0) {
+    commandIndex.value--
+    updateMapTiles()
+  }
+}
+
+function redo() {
+  if (commandIndex.value <= 9 && commandIndex.value <= commandStack.length) {
+    commandIndex.value++
+    updateMapTiles()
+  }
+}
+
+function applyCommands(tiles: string[][], ...commands: EditorCommand[]): string[][] {
+  let tileVersion = cloneArray(tiles)
+  for (let command of commands) {
+    for (const position of command.affectedTiles) {
+      tileVersion[position[1]][position[0]] = command.tileName
+    }
+  }
+  return tileVersion
+}
+
+function updateMapTiles() {
+  if (!mapEditor.currentMap.value) return
+
+  let indexedCommands = commandStack.slice(0, commandIndex.value)
+  let modifiedTiles = applyCommands(originTiles, ...indexedCommands)
+
+  placeTiles(props.tileMap, props.tileMapLayer, modifiedTiles)
+  mapEditor.currentMap.value.tiles = modifiedTiles
+}
+
+//Recursive Array Clone
+function cloneArray(arr: any[]): any[] {
+  return arr.map((item) => (item instanceof Array ? cloneArray(item) : item))
+}
+
+watch(
+  () => mapEditor.shouldClearTiles.value,
+  (shouldClear) => {
+    if (shouldClear && mapEditor.currentMap.value) {
+      const blankTiles = createTileArray(props.tileMapLayer.width, props.tileMapLayer.height, 'blank_tile')
+      placeTiles(props.tileMap, props.tileMapLayer, blankTiles)
+      mapEditor.currentMap.value.tiles = blankTiles
+      mapEditor.resetClearTilesFlag()
+    }
+  }
+)
+
 onMounted(async () => {
   if (!mapEditor.currentMap.value) return
   const mapState = mapEditor.currentMap.value
 
+  //Clone
+  originTiles = cloneArray(mapState.tiles)
+
   placeTiles(props.tileMap, props.tileMapLayer, mapState.tiles)
 })
 </script>

src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue

@@ -1,13 +1,6 @@
 <template>
-  <PlacedMapObject
-    v-if="mapEditor.tool.value === 'pencil' && mapEditor.drawMode.value === 'map_object' && mapEditor.isPlacedMapObjectPreviewEnabled.value && mapEditor.selectedMapObject.value && previewPlacedMapObject"
-    :tileMap
-    :tileMapLayer
-    :key="previewPlacedMapObject?.id"
-    :placedMapObject="previewPlacedMapObject as PlacedMapObjectT"
-  />
   <SelectedPlacedMapObjectComponent v-if="mapEditor.selectedPlacedObject.value" :key="mapEditor.selectedPlacedObject.value.id" :map :placedMapObject="mapEditor.selectedPlacedObject.value" @move="moveMapObject" @rotate="rotatePlacedMapObject" @delete="deletePlacedMapObject" />
-  <PlacedMapObject v-for="placedMapObject in mapEditor.currentMap.value?.placedMapObjects" :tileMap :tileMapLayer :placedMapObject @pointerdown="clickPlacedMapObject(placedMapObject)" :key="`${placedMapObject.id}-${placedMapObjectKey}`" />
+  <PlacedMapObject v-for="placedMapObject in mapEditor.currentMap.value?.placedMapObjects" :tileMap :tileMapLayer :placedMapObject @pointerdown="clickPlacedMapObject(placedMapObject)" />
 </template>
 
 <script setup lang="ts">
@@ -18,7 +11,7 @@ import SelectedPlacedMapObjectComponent from '@/components/gameMaster/mapEditor/
 import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
 import { getTile } from '@/services/mapService'
 import { useScene } from 'phavuer'
-import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
+import { computed } from 'vue'
 
 import Tilemap = Phaser.Tilemaps.Tilemap
 import TilemapLayer = Phaser.Tilemaps.TilemapLayer
@@ -26,9 +19,6 @@ import TilemapLayer = Phaser.Tilemaps.TilemapLayer
 const scene = useScene()
 const mapEditor = useMapEditorComposable()
 const map = computed(() => mapEditor.currentMap.value!)
-const placedMapObjectKey = computed(() => mapEditor.refreshMapObject.value)
-
-const emit = defineEmits<{ (e: 'update', map: MapT): void; (e: 'updateAndCommit', map: MapT): void; (e: 'pauseObjectTracking'): void; (e: 'resumeObjectTracking'): void }>()
 
 defineExpose({ handlePointer })
 
@@ -37,59 +27,36 @@ const props = defineProps<{
   tileMapLayer: TilemapLayer
 }>()
 
-const previewPosition = ref({ x: 0, y: 0 })
-const previewPlacedMapObject = computed(() => ({
-  id: mapEditor.selectedMapObject.value!.id,
-  mapObject: mapEditor.selectedMapObject.value!.id,
-  isRotated: false,
-  positionX: previewPosition.value.x,
-  positionY: previewPosition.value.y
-}))
-
-function updatePreviewPosition(pointer: Phaser.Input.Pointer) {
-  const tile = getTile(props.tileMap, pointer.worldX, pointer.worldY)
-  if (!tile || (previewPosition.value.x === tile.x && previewPosition.value.y === tile.y)) return
-
-  previewPosition.value = { x: tile.x, y: tile.y }
-}
-
 function pencil(pointer: Phaser.Input.Pointer, map: MapT) {
-  emit('pauseObjectTracking')
   const tile = getTile(props.tileMap, pointer.worldX, pointer.worldY)
   if (!tile) return
 
   // Check if object already exists on position
-  const existingPlacedMapObject = findObjectByPointer(pointer, mapEditor.currentMap.value!)
+  const existingPlacedMapObject = findObjectByPointer(pointer, map)
   if (existingPlacedMapObject) return
 
   if (!mapEditor.selectedMapObject.value) return
 
   const newPlacedMapObject: PlacedMapObjectT = {
     id: uuidv4(),
-    mapObject: mapEditor.selectedMapObject.value.id,
+    mapObject: mapEditor.selectedMapObject.value,
     isRotated: false,
     positionX: tile.x,
     positionY: tile.y
   }
 
   // Add new object to mapObjects
-  mapEditor.selectedPlacedObject.value = newPlacedMapObject
   map.placedMapObjects.push(newPlacedMapObject)
-
+  mapEditor.selectedPlacedObject.value = newPlacedMapObject
-  emit('update', map)
 }
 
 function eraser(pointer: Phaser.Input.Pointer, map: MapT) {
-  emit('pauseObjectTracking')
-
   // Check if object already exists on position
   const existingPlacedMapObject = findObjectByPointer(pointer, map)
   if (!existingPlacedMapObject) return
 
   // Remove existing object
   map.placedMapObjects = map.placedMapObjects.filter((placedMapObject) => placedMapObject.id !== existingPlacedMapObject.id)
-
-  emit('update', map)
 }
 
 function findObjectByPointer(pointer: Phaser.Input.Pointer, map: MapT): PlacedMapObjectT | undefined {
@@ -111,8 +78,6 @@ function objectPicker(pointer: Phaser.Input.Pointer, map: MapT) {
 function moveMapObject(id: string, map: MapT) {
   mapEditor.movingPlacedObject.value = map.placedMapObjects.find((object) => object.id === id) as PlacedMapObjectT
 
-  emit('pauseObjectTracking')
-
   function handlePointerMove(pointer: Phaser.Input.Pointer) {
     if (!mapEditor.movingPlacedObject.value) return
     const tile = getTile(props.tileMap, pointer.worldX, pointer.worldY)
@@ -123,43 +88,24 @@ function moveMapObject(id: string, map: MapT) {
   }
 
   scene.input.on(Phaser.Input.Events.POINTER_MOVE, handlePointerMove)
-  scene.input.on(Phaser.Input.Events.POINTER_UP, handlePointerUp)
 
-  function handlePointerUp(pointer: Phaser.Input.Pointer) {
+  function handlePointerUp() {
     scene.input.off(Phaser.Input.Events.POINTER_MOVE, handlePointerMove)
-
-    const tile = getTile(props.tileMap, pointer.worldX, pointer.worldY)
-    if (!tile) return
-
-    map.placedMapObjects.map((placed) => {
-      if (placed.id === id) {
-        placed.positionX = tile.x
-        placed.positionY = tile.y
-      }
-    })
-
     mapEditor.movingPlacedObject.value = null
-
-    scene.input.off(Phaser.Input.Events.POINTER_UP, handlePointerUp)
-    emit('resumeObjectTracking')
-    emit('updateAndCommit', map)
   }
+
+  scene.input.on(Phaser.Input.Events.POINTER_UP, handlePointerUp)
 }
 
 function rotatePlacedMapObject(id: string, map: MapT) {
-  map.placedMapObjects.map((placed) => {
+  const matchingObject = map.placedMapObjects.find((placedMapObject) => placedMapObject.id === id)
-    if (placed.id === id) {
+  matchingObject!.isRotated = !matchingObject!.isRotated
-      placed.isRotated = !placed.isRotated
-    }
-  })
-
-  emit('updateAndCommit', map)
 }
 
 function deletePlacedMapObject(id: string, map: MapT) {
-  map.placedMapObjects = map.placedMapObjects.filter((object) => object.id !== id)
+  let mapE = mapEditor.currentMap.value!
+  mapE.placedMapObjects = map.placedMapObjects.filter((object) => object.id !== id)
   mapEditor.selectedPlacedObject.value = null
-  emit('updateAndCommit', map)
 }
 
 function clickPlacedMapObject(placedMapObject: PlacedMapObjectT) {
@@ -191,12 +137,4 @@ function handlePointer(pointer: Phaser.Input.Pointer) {
       break
   }
 }
-
-onMounted(() => {
-  scene.input.on(Phaser.Input.Events.POINTER_MOVE, updatePreviewPosition)
-})
-
-onUnmounted(() => {
-  scene.input.off(Phaser.Input.Events.POINTER_MOVE, updatePreviewPosition)
-})
 </script>

src/components/gameMaster/mapEditor/partials/CreateMap.vue

@@ -35,11 +35,9 @@
 </template>
 
 <script setup lang="ts">
-import { SocketEvent } from '@/application/enums'
 import type { Map } from '@/application/types'
 import Modal from '@/components/utilities/Modal.vue'
 import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
-import { socketManager } from '@/managers/SocketManager'
 import { MapStorage } from '@/storage/storages'
 import { useGameStore } from '@/stores/gameStore'
 import { ref, useTemplateRef } from 'vue'
@@ -58,7 +56,7 @@ const pvp = ref(false)
 defineExpose({ open: () => modalRef.value?.open() })
 
 async function submit() {
-  socketManager.emit(SocketEvent.GM_MAP_CREATE, { name: name.value, width: width.value, height: height.value }, async (response: Map | false) => {
+  gameStore.connection?.emit('gm:map:create', { name: name.value, width: width.value, height: height.value }, async (response: Map | false) => {
     if (!response) {
       return
     }

src/components/gameMaster/mapEditor/partials/MapList.vue

@@ -1,15 +1,17 @@
 <template>
   <Modal ref="modalRef" :is-resizable="false" :modal-width="300" :modal-height="360" bg-style="none">
     <template #modalHeader>
-      <div class="flex items-center">
+      <h3 class="text-lg text-white">Maps</h3>
-        <button class="btn-cyan w-7 h-7 font-normal flex items-center justify-center" @click="createMapModal?.open">+</button>
-        <h3 class="text-lg text-white ml-2">Maps</h3>
-      </div>
     </template>
     <template #modalBody>
-      <div class="mx-auto h-full">
+      <div class="my-4 mx-auto h-full">
-        <div class="overflow-y-auto h-[calc(100%)]">
+        <div class="text-center mb-4 px-2 flex gap-2.5">
+          <button class="btn-cyan py-1.5 min-w-[calc(50%_-_5px)]" @click="fetchMaps">Refresh</button>
+          <button class="btn-cyan py-1.5 min-w-[calc(50%_-_5px)]" @click="createMapModal?.open">New</button>
+        </div>
+        <div class="overflow-y-auto h-[calc(100%-20px)]">
           <div class="relative p-2.5 cursor-pointer flex gap-y-2.5 gap-x-5 flex-wrap" v-for="(map, index) in mapList" :key="map.id">
+            <div class="absolute left-0 top-0 w-full h-px bg-gray-500" v-if="index === 0"></div>
             <div class="flex gap-3 items-center w-full" @click="() => loadMap(map.id)">
               <span>{{ map.name }}</span>
               <span class="ml-auto gap-1 flex">
@@ -22,18 +24,18 @@
       </div>
     </template>
   </Modal>
+
   <CreateMap ref="createMapModal" @create="fetchMaps" />
 </template>
 
 <script setup lang="ts">
-import { SocketEvent } from '@/application/enums'
+import type { Map, UUID } from '@/application/types'
-import type { Map } from '@/application/types'
 import CreateMap from '@/components/gameMaster/mapEditor/partials/CreateMap.vue'
 import Modal from '@/components/utilities/Modal.vue'
 import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
-import { socketManager } from '@/managers/SocketManager'
 import { MapStorage } from '@/storage/storages'
 import { useGameStore } from '@/stores/gameStore'
+import { useMapEditorStore } from '@/stores/mapEditorStore'
 import { onMounted, ref, useTemplateRef } from 'vue'
 
 const gameStore = useGameStore()
@@ -58,15 +60,15 @@ async function fetchMaps() {
   mapList.value = await mapStorage.getAll()
 }
 
-function loadMap(id: string) {
+function loadMap(id: UUID) {
-  socketManager.emit(SocketEvent.GM_MAP_REQUEST, { mapId: id }, (response: Map) => {
+  gameStore.connection?.emit('gm:map:request', { mapId: id }, (response: Map) => {
     mapEditor.loadMap(response)
   })
   modalRef.value?.close()
 }
 
-async function deleteMap(id: string) {
+async function deleteMap(id: UUID) {
-  socketManager.emit(SocketEvent.GM_MAP_DELETE, { mapId: id }, async (response: boolean) => {
+  gameStore.connection?.emit('gm:map:delete', { mapId: id }, async (response: boolean) => {
     if (!response) {
       gameStore.addNotification({
         title: 'Error',

src/components/gameMaster/mapEditor/partials/MapObjectList.vue

@@ -1,18 +1,13 @@
 <template>
-  <div class="absolute border-0 border-l-2 border-solid border-gray-500 w-1/4 min-w-80 flex flex-col top-0 right-0 z-10 h-dvh bg-gray-800" v-if="mapEditor.tool.value === 'pencil' && mapEditor.drawMode.value === 'map_object'">
+  <div class="absolute border-0 border-l-2 border-solid border-gray-500 w-1/4 min-w-80 flex flex-col top-0 right-0 z-10 h-dvh bg-gray-800">
     <div class="flex flex-col gap-2.5 p-2.5">
-      <div class="flex justify-between items-center">
+      <div class="relative flex">
-        <div class="flex-grow">
+        <img src="/assets/icons/mapEditor/search.svg" class="w-4 h-4 py-0.5 absolute top-1/2 -translate-y-1/2 left-2.5" alt="Search icon" />
-          <div class="relative flex">
+        <label class="mb-1.5 font-titles hidden" for="search">Search</label>
-            <img src="/assets/icons/mapEditor/search.svg" class="w-4 h-4 py-0.5 absolute top-1/2 -translate-y-1/2 left-2.5" alt="Search icon" />
+        <input @mousedown.stop class="!pl-7 input-field w-full" type="text" name="search" placeholder="Search" v-model="searchQuery" />
-            <label class="mb-1.5 font-titles hidden" for="search">Search</label>
-            <input @mousedown.stop class="!pl-7 input-field w-full" type="text" name="search" placeholder="Search" v-model="searchQuery" />
-          </div>
-        </div>
-        <img src="/assets/icons/mapEditor/dropdown-chevron.svg" class="w-12 h-12 ml-2 cursor-pointer hover:opacity-80 -rotate-90" alt="Close" @click="mapEditor.setTool('move')" />
       </div>
       <div class="flex">
-        <select class="input-field w-full" name="lists" v-model="mapEditor.drawMode.value" @change="(event: any) => mapEditor.setDrawMode(event.target.value)">
+        <select class="input-field w-full" name="lists">
           <option value="tile">Tiles</option>
           <option value="map_object">Objects</option>
         </select>

src/components/gameMaster/mapEditor/partials/SelectedPlacedMapObject.vue

@@ -41,11 +41,9 @@
 </template>
 
 <script setup lang="ts">
-import { SocketEvent } from '@/application/enums'
 import type { MapObject, Map as MapT, PlacedMapObject } from '@/application/types'
 import Modal from '@/components/utilities/Modal.vue'
 import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
-import { socketManager } from '@/managers/SocketManager'
 import { MapObjectStorage } from '@/storage/storages'
 import { useGameStore } from '@/stores/gameStore'
 import { onMounted, ref } from 'vue'
@@ -82,8 +80,8 @@ const handleDelete = () => {
 async function handleUpdate() {
   if (!mapObject.value) return
 
-  socketManager.emit(
+  gameStore.connection?.emit(
-    SocketEvent.GM_MAPOBJECT_UPDATE,
+    'gm:mapObject:update',
     {
       id: props.placedMapObject.mapObject as string,
       name: mapObjectName.value,

src/components/gameMaster/mapEditor/partials/TeleportModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <Modal v-if="showTeleportModal" ref="modalRef" @modal:close="() => mapEditor.setTool('move')" :modal-width="300" :modal-height="350" :is-resizable="false" bg-style="none">
+  <Modal ref="modalRef" @modal:close="() => mapEditorStore.setTool('move')" :modal-width="300" :modal-height="350" :is-resizable="false" bg-style="none">
     <template #modalHeader>
       <h3 class="m-0 font-medium shrink-0 text-white">Teleport settings</h3>
     </template>
@@ -28,7 +28,7 @@
               <label for="toMap">Map to teleport to</label>
               <select v-model="toMap" class="input-field" name="toMap" id="toMap">
                 <option :value="null">Select map</option>
-                <option v-for="map in mapList" :key="map.id" :value="map.id">{{ map.name }}</option>
+                <option v-for="map in mapList" :key="map.id" :value="map">{{ map.name }}</option>
               </select>
             </div>
           </div>
@@ -41,48 +41,48 @@
 <script setup lang="ts">
 import type { Map } from '@/application/types'
 import Modal from '@/components/utilities/Modal.vue'
-import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
+import { useGameStore } from '@/stores/gameStore'
-import { MapStorage } from '@/storage/storages'
+import { useMapEditorStore } from '@/stores/mapEditorStore'
 import { computed, onMounted, ref, useTemplateRef, watch } from 'vue'
 
-const showTeleportModal = computed(() => mapEditor.tool.value === 'pencil' && mapEditor.drawMode.value === 'teleport')
+const showTeleportModal = computed(() => mapEditorStore.tool === 'pencil' && mapEditorStore.drawMode === 'teleport')
-const mapStorage = new MapStorage()
+const mapEditorStore = useMapEditorStore()
-const mapEditor = useMapEditorComposable()
+const gameStore = useGameStore()
-const modalRef = useTemplateRef('modalRef')
 const mapList = ref<Map[]>([])
+const modalRef = useTemplateRef('modalRef')
 
 defineExpose({
   open: () => modalRef.value?.open()
 })
 
+onMounted(fetchMaps)
+
+function fetchMaps() {
+  gameStore.connection?.emit('gm:map:list', {}, (response: Map[]) => {
+    mapList.value = response
+  })
+}
+
 const { toPositionX, toPositionY, toRotation, toMap } = useRefTeleportSettings()
 
 function useRefTeleportSettings() {
-  const settings = mapEditor.teleportSettings.value
+  const settings = mapEditorStore.teleportSettings
   return {
     toPositionX: ref(settings.toPositionX),
     toPositionY: ref(settings.toPositionY),
     toRotation: ref(settings.toRotation),
-    toMap: ref(settings.toMap)
+    toMap: ref(settings.toMapId)
   }
 }
 
 watch([toPositionX, toPositionY, toRotation, toMap], updateTeleportSettings)
 
 function updateTeleportSettings() {
-  mapEditor.setTeleportSettings({
+  mapEditorStore.setTeleportSettings({
     toPositionX: toPositionX.value,
     toPositionY: toPositionY.value,
     toRotation: toRotation.value,
-    toMap: toMap.value
+    toMapId: toMap.value
   })
 }
-
-async function fetchMaps() {
-  mapList.value = await mapStorage.getAll()
-}
-
-onMounted(async () => {
-  await fetchMaps()
-})
 </script>

src/components/gameMaster/mapEditor/partials/TileList.vue

@@ -1,18 +1,13 @@
 <template>
-  <div class="absolute border-0 border-l-2 border-solid border-gray-500 w-1/4 min-w-80 flex flex-col top-0 right-0 z-10 h-dvh bg-gray-800" v-if="(mapEditor.tool.value === 'pencil' && mapEditor.drawMode.value === 'tile') || mapEditor.tool.value === 'paint'">
+  <div class="absolute border-0 border-l-2 border-solid border-gray-500 w-1/4 min-w-80 flex flex-col top-0 right-0 z-10 h-dvh bg-gray-800">
     <div class="flex flex-col gap-2.5 p-2.5">
-      <div class="flex justify-between items-center">
+      <div class="relative flex">
-        <div class="flex-grow">
+        <img src="/assets/icons/mapEditor/search.svg" class="w-4 h-4 py-0.5 absolute top-1/2 -translate-y-1/2 left-2.5" alt="Search icon" />
-          <div class="relative flex">
+        <label class="mb-1.5 font-titles hidden" for="search">Search</label>
-            <img src="/assets/icons/mapEditor/search.svg" class="w-4 h-4 py-0.5 absolute top-1/2 -translate-y-1/2 left-2.5" alt="Search icon" />
+        <input @mousedown.stop class="!pl-7 input-field w-full" type="text" name="search" placeholder="Search" v-model="searchQuery" />
-            <label class="mb-1.5 font-titles hidden" for="search">Search</label>
-            <input @mousedown.stop class="!pl-7 input-field w-full" type="text" name="search" placeholder="Search" v-model="searchQuery" />
-          </div>
-        </div>
-        <img src="/assets/icons/mapEditor/dropdown-chevron.svg" class="w-12 h-12 ml-2 cursor-pointer hover:opacity-80 -rotate-90" alt="Close" @click="mapEditor.setTool('move')" />
       </div>
       <div class="flex">
-        <select class="input-field w-full" name="lists" v-model="mapEditor.drawMode.value" @change="(event: any) => mapEditor.setDrawMode(event.target.value)">
+        <select class="input-field w-full" name="lists">
           <option value="tile">Tiles</option>
           <option value="map_object">Objects</option>
         </select>
@@ -42,9 +37,8 @@
       </div>
       <div v-else class="h-full overflow-auto">
         <div class="p-4">
-          <div class="text-center mb-8">
+          <button @click="closeGroup" class="btn-cyan mb-4">Back to All Tiles</button>
-            <button @click="closeGroup" class="hover:text-white">Back to all tiles</button>
+          <h4 class="text-lg mb-4">{{ selectedGroup.parent.name }} Group</h4>
-          </div>
           <div class="grid grid-cols-4 gap-2 justify-items-center">
             <div class="flex flex-col items-center justify-center">
               <img

src/components/gameMaster/mapEditor/partials/Toolbar.vue

@@ -68,7 +68,7 @@
 
         <div class="w-px bg-cyan"></div>
 
-        <button class="flex justify-center items-center min-w-10 p-0 relative" @click="isMapEditorSettingsModalOpen = !isMapEditorSettingsModalOpen"><img class="invert w-5 h-5" src="/assets/icons/mapEditor/gear.svg" alt="Map settings" /> <span class="h-5 ml-2.5">(Z)</span></button>
+        <button class="flex justify-center items-center min-w-10 p-0 relative" @click="handleClick('settings')"><img class="invert w-5 h-5" src="/assets/icons/mapEditor/gear.svg" alt="Map settings" /> <span class="h-5 ml-2.5">(Z)</span></button>
 
         <div class="w-px bg-cyan"></div>
 
@@ -79,7 +79,7 @@
       <button class="btn-cyan px-3.5" @click="() => emit('open-maps')">Load</button>
       <button class="btn-cyan px-3.5" @click="() => emit('save')" v-if="mapEditor.currentMap.value">Save</button>
       <button class="btn-cyan px-3.5" @click="() => emit('clear')" v-if="mapEditor.currentMap.value">Clear</button>
-      <button class="btn-cyan px-3.5" @click="() => mapEditor.toggleActive()">Exit</button>
+      <button class="btn-cyan px-3.5" @click="() => emit('close-editor')">Exit</button>
     </div>
   </div>
 
@@ -89,13 +89,9 @@
     </template>
     <template #modalBody>
       <div class="m-4 flex items-center space-x-2">
-        <input id="continuous-drawing" @change="toggleContinuousDrawing" v-model="isContinuousDrawingEnabled" type="checkbox" class="h-4 w-4 rounded border-gray-300 text-blue-600 focus:ring-blue-500" />
+        <input id="continuous-drawing" @change="handleCheck" v-model="checkboxValue" type="checkbox" class="h-4 w-4 rounded border-gray-300 text-blue-600 focus:ring-blue-500" />
         <label for="continuous-drawing" class="text-sm font-medium text-gray-200 cursor-pointer"> Continuous Drawing </label>
       </div>
-      <div class="m-4 flex items-center space-x-2">
-        <input id="show-placed-map-object-preview" @change="mapEditor.togglePlacedMapObjectPreview()" v-model="isShowPlacedMapObjectPreviewEnabled" type="checkbox" class="h-4 w-4 rounded border-gray-300 text-blue-600 focus:ring-blue-500" />
-        <label for="show-placed-map-object-preview" class="text-sm font-medium text-gray-200 cursor-pointer"> Show placed map object preview </label>
-      </div>
     </template>
   </Modal>
 </template>
@@ -104,20 +100,19 @@
 import Modal from '@/components/utilities/Modal.vue'
 import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
 import { onClickOutside } from '@vueuse/core'
-import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
+import { onBeforeUnmount, onMounted, ref } from 'vue'
 
 const mapEditor = useMapEditorComposable()
 
-const emit = defineEmits(['save', 'clear', 'open-maps', 'open-settings', 'open-teleport'])
+const emit = defineEmits(['save', 'clear', 'open-maps', 'open-settings', 'close-editor'])
 
 // States
 const toolbar = ref(null)
 const isMapEditorSettingsModalOpen = ref(false)
 const selectPencilOpen = ref(false)
 const selectEraserOpen = ref(false)
-const isContinuousDrawingEnabled = ref<Boolean>(false)
+const checkboxValue = ref<Boolean>(false)
-const isShowPlacedMapObjectPreviewEnabled = ref<Boolean>(mapEditor.isPlacedMapObjectPreviewEnabled.value)
+const listOpen = ref(false)
-const listOpen = computed(() => (mapEditor.tool.value === 'pencil' && (mapEditor.drawMode.value === 'tile' || mapEditor.drawMode.value === 'map_object')) || mapEditor.tool.value === 'paint')
 
 // drawMode
 function setDrawMode(value: string) {
@@ -137,8 +132,8 @@ function setEraserMode() {
   selectEraserOpen.value = false
 }
 
-function toggleContinuousDrawing() {
+function handleCheck() {
-  mapEditor.setInputMode(isContinuousDrawingEnabled.value ? 'hold' : 'tap')
+  mapEditor.setInputMode(checkboxValue.value ? 'hold' : 'tap')
 }
 
 function handleModeClick(mode: string, type: 'pencil' | 'eraser') {
@@ -147,11 +142,20 @@ function handleModeClick(mode: string, type: 'pencil' | 'eraser') {
 }
 
 function handleClick(tool: string) {
-  mapEditor.setTool(tool)
+  if (tool === 'mapEditorSettings') {
-  if (tool === 'paint') mapEditor.setDrawMode('tile')
+    isMapEditorSettingsModalOpen.value = true
+    listOpen.value = false
+  } else if (tool === 'settings') {
+    listOpen.value = false
+  } else if (tool === 'move') {
+    listOpen.value = false
+    mapEditor.setTool(tool)
+  } else {
+    mapEditor.setTool(tool)
+  }
+
   selectPencilOpen.value = tool === 'pencil' ? !selectPencilOpen.value : false
   selectEraserOpen.value = tool === 'eraser' ? !selectEraserOpen.value : false
-  if (mapEditor.drawMode.value === 'teleport') emit('open-teleport')
 }
 
 function cycleToolMode(tool: 'pencil' | 'eraser') {
@@ -167,7 +171,7 @@ function initKeyShortcuts(event: KeyboardEvent) {
   // Check if map is set
   if (!mapEditor.currentMap.value) return
 
-  // prevent if focused on inputs
+  // prevent if focused on composables
   if (document.activeElement?.tagName === 'INPUT') return
 
   if (event.ctrlKey) return

src/components/login/LoginForm.vue

@@ -26,7 +26,6 @@
 </template>
 
 <script setup lang="ts">
-import { socketManager } from '@/managers/SocketManager'
 import { login } from '@/services/authenticationService'
 import { useGameStore } from '@/stores/gameStore'
 import { useCookies } from '@vueuse/integrations/useCookies'
@@ -40,6 +39,15 @@ const password = ref('')
 const formError = ref('')
 const showPassword = ref(false)
 
+// automatic login because of development
+onMounted(async () => {
+  const token = useCookies().get('token')
+  if (token) {
+    gameStore.setToken(token)
+    gameStore.initConnection()
+  }
+})
+
 async function submit() {
   // check if username and password are valid
   if (username.value === '' || password.value === '') {
@@ -54,7 +62,7 @@ async function submit() {
     formError.value = response.error
     return
   }
-  socketManager.setToken(response.token)
+  gameStore.setToken(response.token)
   gameStore.initConnection()
   return true // Indicate success
 }

src/components/login/NewPasswordForm.vue

@@ -34,6 +34,15 @@ const password = ref('')
 const newPasswordError = ref('')
 const showPassword = ref(false)
 
+// automatic login because of development
+onMounted(async () => {
+  const token = useCookies().get('token')
+  if (token) {
+    gameStore.setToken(token)
+    gameStore.initConnection()
+  }
+})
+
 async function newPasswordFunc() {
   // check if username and password are valid
   if (password.value === '') {

src/components/login/RegisterForm.vue

@@ -26,7 +26,6 @@
 </template>
 
 <script setup lang="ts">
-import { socketManager } from '@/managers/SocketManager'
 import { login, register } from '@/services/authenticationService'
 import { useGameStore } from '@/stores/gameStore'
 import { useCookies } from '@vueuse/integrations/useCookies'
@@ -41,6 +40,15 @@ const email = ref('')
 const formError = ref('')
 const showPassword = ref(false)
 
+// automatic login because of development
+onMounted(async () => {
+  const token = useCookies().get('token')
+  if (token) {
+    gameStore.setToken(token)
+    gameStore.initConnection()
+  }
+})
+
 async function submit() {
   // check if username and password are valid
   if (username.value === '' || email.value === '' || password.value === '') {
@@ -68,7 +76,7 @@ async function submit() {
     return
   }
 
-  socketManager.setToken(loginResponse.token)
+  gameStore.setToken(loginResponse.token)
   gameStore.initConnection()
 }
 </script>

src/components/screens/Characters.vue

@@ -10,9 +10,8 @@
       <div class="filler"></div>
       <div class="w-2/3 max-w-[860px]" v-if="!isLoading">
         <div class="mb-5 flex flex-col gap-1">
-          <h1 class="text-white font-bold">{{ isCreatingCharacter ? 'CREATE CHARACTER' : 'SELECT CHARACTER TO PLAY' }}</h1>
+          <h1 class="text-white font-bold">SELECT CHARACTER TO PLAY</h1>
-          <p class="m-0" v-if="!isCreatingCharacter">Maximum of 4 characters can be created per player</p>
+          <p class="m-0">Maximum of 4 characters can be created per player</p>
-          <p class="m-0" v-if="isCreatingCharacter">Customize your new character</p>
         </div>
         <div class="flex w-full max-lg:flex-col lg:h-[400px] default-border rounded-md bg-gray">
           <div class="lg:min-w-[285px] max-lg:min-h-[383px] lg:w-1/3 h-full bg-[url('/assets/ui-texture.png')] bg-no-repeat bg-cover bg-center border-0 max-lg:border-b lg:border-r border-solid border-gray-500 max-lg:rounded-t-md lg:rounded-l-md relative">
@@ -21,95 +20,68 @@
                 <img src="/assets/placeholders/head.png" class="w-9 h-9 object-contain center-element" alt="Player head" />
                 <input class="h-full w-full absolute m-0 z-10 hover:cursor-pointer focus-visible:outline-offset-0 btn-sound" type="radio" name="character" :value="character.id" v-model="selectedCharacterId" />
               </div>
-              <div class="character relative rounded default-border w-12 h-12 bg-[url('/assets/ui-texture.png')]" :class="{ active: isCreatingCharacter }" v-if="characters.length < characterCreationSettings.maxCharacters">
+              <div class="character relative rounded default-border w-12 h-12 bg-[url('/assets/ui-texture.png')]" :class="{ active: characters.length == 0 }" v-if="characters.length < 4">
-                <button class="p-0 h-full w-full flex flex-col justify-between focus-visible:outline-offset-0 btn-sound" @click="startCharacterCreation">
+                <button class="p-0 h-full w-full flex flex-col justify-between focus-visible:outline-offset-0 btn-sound" @click="isCreateNewCharacterModalOpen = true">
-                  <img class="w-6 h-6 object-contain center-element btn-sound" draggable="false" src="/assets/icons/plus-icon.svg" alt="Add character" />
+                  <img class="w-6 h-6 object-contain center-element btn-sound" draggable="false" src="/assets/icons/plus-icon.svg" />
                 </button>
               </div>
             </div>
-            <div class="py-6 px-8 h-[calc(100%_-_48px)] flex flex-col items-center gap-6 justify-center">
+            <div class="py-6 px-8 h-[calc(100%_-_48px)] flex flex-col items-center gap-6 justify-center" v-if="selectedCharacterId">
-              <template v-if="selectedCharacterId && !isCreatingCharacter">
+              <input class="input-field w-[158px]" type="text" name="name" :placeholder="characters.find((c) => c.id == selectedCharacterId)?.name" />
-                <input class="input-field w-[158px]" type="text" name="name" :placeholder="characters.find((c) => c.id == selectedCharacterId)?.name" v-model="newNickname" />
+              <div class="flex flex-col gap-4 items-center">
-                <div class="flex flex-col gap-4 items-center">
+                <div class="flex flex-col gap-3">
-                  <div class="flex flex-col gap-3">
+                  <div class="bg-[url('/assets/ui-elements/character-select-ui-shape.svg')] w-[190px] h-52 bg-no-repeat bg-center flex items-center justify-between">
-                    <div class="bg-[url('/assets/ui-elements/character-select-ui-shape.svg')] w-[190px] h-52 bg-no-repeat bg-center flex items-center justify-between">
-                      <button class="ml-6 w-4 h-8 p-0">
-                        <img src="/assets/icons/triangle-icon.svg" class="w-3 h-3.5 m-auto" alt="Arrow left" />
-                      </button>
-                      <img class="w-24 object-contain mb-3.5 max-h-[70%]" alt="Player avatar" :src="config.server_endpoint + '/avatar/s/' + characters.find((c) => c.id === selectedCharacterId)?.characterType + '/' + (selectedHairId ?? 'default')" />
-                      <button class="mr-6 w-4 h-8 p-0">
-                        <img src="/assets/icons/triangle-icon.svg" class="w-3 h-3.5 -scale-x-100" alt="Arrow right" />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </template>
-              <template v-if="isCreatingCharacter">
-                <div class="flex flex-col gap-4 items-center">
-                  <input class="input-field" v-model="newCharacterName" name="name" id="name" placeholder="Enter a nickname..." />
-                  <div class="bg-[url('/assets/ui-elements/character-select-ui-shape.svg')] w-[190px] h-52 bg-no-repeat bg-center flex items-center justify-center">
                     <button class="ml-6 w-4 h-8 p-0">
                       <img src="/assets/icons/triangle-icon.svg" class="w-3 h-3.5 m-auto" alt="Arrow left" />
                     </button>
-                    <img class="w-24 object-contain mb-3.5 max-h-[70%]" alt="Player avatar" :src="config.server_endpoint + '/avatar/s/' + defaultCharacterTypeId + '/' + (selectedHairId ?? 'default')" />
+                    <img class="w-24 object-contain mb-3.5 max-h-[70%]" alt="Player avatar" :src="config.server_endpoint + '/avatar/s/' + characters.find((c) => c.id === selectedCharacterId)?.characterType + '/' + (selectedHairId ?? 'default')" />
                     <button class="mr-6 w-4 h-8 p-0">
                       <img src="/assets/icons/triangle-icon.svg" class="w-3 h-3.5 -scale-x-100" alt="Arrow right" />
                     </button>
                   </div>
-                  <div class="flex justify-between w-[190px]">
-                    <button class="btn-empty flex gap-2" :class="{ selected: selectedGender === 'MALE' }" @click="selectedGender = 'MALE'">
-                      <img src="/assets/icons/male-icon.svg" class="w-4 h-4 m-auto" alt="Male symbol" />
-                      <span class="text-white">Male</span>
-                    </button>
-                    <button class="btn-empty flex gap-2" :class="{ selected: selectedGender === 'FEMALE' }" @click="selectedGender = 'FEMALE'">
-                      <img src="/assets/icons/male-icon.svg" class="w-4 h-4 m-auto" alt="Female symbol" />
-                      <span class="text-white">Female</span>
-                    </button>
-                  </div>
                 </div>
-              </template>
+                <!-- TODO: update gender on (selected) character -->
+                <!--                <div class="flex justify-between w-[190px]">-->
+                <!--                  <button class="btn-empty flex gap-2" :class="{ selected: characters.find((c) => c.id == selectedCharacterId)?.characterType?.gender === 'MALE' }">-->
+                <!--                    <img src="/assets/icons/male-icon.svg" class="w-4 h-4 m-auto" alt="Male symbol" />-->
+                <!--                    <span class="text-white">Male</span>-->
+                <!--                  </button>-->
+                <!--                  <button class="btn-empty flex gap-2" :class="{ selected: characters.find((c) => c.id == selectedCharacterId)?.characterType?.gender === 'FEMALE' }">-->
+                <!--                    <img src="/assets/icons/male-icon.svg" class="w-4 h-4 m-auto" alt="Male symbol" />-->
+                <!--                    <span class="text-white">Female</span>-->
+                <!--                  </button>-->
+                <!--                </div>-->
+              </div>
             </div>
           </div>
           <div class="flex-1 lg:w-2/3 max-lg:min-h-[212px] h-full bg-[url('/assets/ui-texture.png')] bg-no-repeat bg-cover bg-center max-lg:rounded-bl-md rounded-r-md">
-            <div class="py-6 px-8 h-[calc(100%_-_48px)] flex flex-col items-center gap-10" v-if="selectedCharacterId || isCreatingCharacter">
+            <div class="py-6 px-8 h-[calc(100%_-_48px)] flex flex-col items-center gap-10" v-if="selectedCharacterId">
-              <div class="flex flex-col gap-3 w-full">
-                <span class="text-sm">Hair color</span>
-                <div class="flex gap-2 flex-wrap">
-                  <div
-                    class="hair-deselect relative flex justify-center items-center bg-gray default-border w-[18px] h-[18px] p-2 rounded-sm hover:bg-gray-500 hover:border-gray-400 focus-visible:outline-none focus-visible:border-white focus-visible:bg-cyan has-[:checked]:bg-cyan has-[:checked]:border-transparent"
-                  >
-                    <img src="/assets/icons/x-button-gray.svg" class="w-4 h-4" alt="Empty button" />
-                    <input type="radio" name="hair-color" :value="null" v-model="selectedHairColor" class="h-full w-full absolute left-0 top-0 m-0 z-10 hover:cursor-pointer focus-visible:outline-offset-0 focus-visible:outline-white" />
-                  </div>
-                  <div
-                    v-for="color in uniqueHairColors"
-                    class="relative flex justify-center items-center default-border w-[18px] h-[18px] p-2 rounded-sm hover:bg-gray-500 hover:border-gray-400 focus-visible:outline-none focus-visible:border-gray-300 focus-visible:bg-gray-500 has-[:checked]:bg-cyan has-[:checked]:border-transparent"
-                  >
-                    <div class="w-full h-full rounded-sm" :style="getHairColorStyle(color)"></div>
-                    <input type="radio" name="hair-color" :value="color" v-model="selectedHairColor" class="h-full w-full absolute left-0 top-0 m-0 z-10 hover:cursor-pointer focus-visible:outline-offset-0 focus-visible:outline-white" />
-                  </div>
-                </div>
-              </div>
               <div class="flex flex-col gap-3 w-full">
                 <span class="text-sm">Hairstyle</span>
-                <div class="flex gap-2 flex-wrap">
+                <div class="flex gap-2 flex-wrap max-h-20 overflow-y-auto scrollbar">
                   <div
                     class="hair-deselect relative flex justify-center items-center bg-gray default-border w-[18px] h-[18px] p-2 rounded-sm hover:bg-gray-500 hover:border-gray-400 focus-visible:outline-none focus-visible:border-white focus-visible:bg-cyan has-[:checked]:bg-cyan has-[:checked]:border-transparent"
                   >
                     <img src="/assets/icons/x-button-gray.svg" class="w-4 h-4" alt="Empty button" />
                     <input type="radio" name="hair" :value="null" v-model="selectedHairId" class="h-full w-full absolute left-0 top-0 m-0 z-10 hover:cursor-pointer focus-visible:outline-offset-0 focus-visible:outline-white" />
                   </div>
+                  <!-- TODO #255: make radio button so we can set a value, do the same with swatches -->
                   <div
-                    v-for="hair in filteredHairs"
+                    v-for="hair in characterHairs"
-                    class="relative flex justify-center items-center bg-gray default-border w-[18px] h-[18px] p-2 rounded-sm hover:bg-gray-500 hover:border-gray-400 focus-visible:outline-none focus-visible:border-gray-300 focus-visible:bg-gray-500 has-[:checked]:bg-cyan has-[:checked]:border-transparent overflow-hidden"
+                    class="relative flex justify-center items-center bg-gray default-border w-[18px] h-[18px] p-2 rounded-sm hover:bg-gray-500 hover:border-gray-400 focus-visible:outline-none focus-visible:border-gray-300 focus-visible:bg-gray-500 has-[:checked]:bg-cyan has-[:checked]:border-transparent"
                   >
-                    <div class="absolute inset-0 flex items-center justify-center">
+                    <img class="h-4 object-contain" :src="config.server_endpoint + '/textures/sprites/' + hair.sprite + '/front.png'" alt="Hair sprite" />
-                      <img class="h-16 object-contain scale-[1] mt-8 origin-center" :src="config.server_endpoint + '/textures/sprites/' + hair.sprite + '/front.png'" alt="Hair sprite" />
-                    </div>
                     <input type="radio" name="hair" :value="hair.id" v-model="selectedHairId" class="h-full w-full absolute left-0 top-0 m-0 z-10 hover:cursor-pointer focus-visible:outline-offset-0 focus-visible:outline-white" />
                   </div>
                 </div>
               </div>
+              <div class="flex flex-col gap-3 w-full">
+                <span class="text-sm">Hair color</span>
+                <div class="flex gap-2 flex-wrap">
+                  <!-- TODO: replace with hair colors -->
+                  <input type="radio" name="hair-color" v-for="n in 10" class="bg-red w-6 h-6 m-0 rounded-sm hover:cursor-pointer checked:outline checked:outline-1 checked:outline-white" />
+                </div>
+              </div>
             </div>
           </div>
         </div>
@@ -117,102 +89,75 @@
       <div v-else>
         <img class="w-20 invert-80" src="/assets/icons/loading-icon1.svg" alt="Loading" />
       </div>
+
       <div class="w-2/3 button-wrapper flex self-center justify-center lg:justify-end gap-4 max-w-[860px]" v-if="!isLoading">
-        <template v-if="!isCreatingCharacter">
+        <button class="btn-empty min-w-48" @click.stop="gameStore.disconnectSocket()">Back</button>
-          <button class="btn-empty min-w-48" @click.stop="gameStore.disconnectSocket()">Back</button>
+        <button class="btn-cyan min-w-48 disabled:bg-cyan-800 disabled:cursor-not-allowed" :disabled="!selectedCharacterId" @click="loginWithCharacter()">Play now</button>
-          <button class="btn-cyan min-w-48 disabled:bg-cyan-800 disabled:cursor-not-allowed" :disabled="!selectedCharacterId" @click="loginWithCharacter()">Play now</button>
-        </template>
-        <template v-else>
-          <button class="btn-empty min-w-48" @click="cancelCharacterCreation">Cancel</button>
-          <button class="btn-cyan min-w-48" @click="createCharacter">Create</button>
-        </template>
       </div>
     </div>
   </div>
+
+  <!-- CREATE CHARACTER MODAL -->
+  <Modal :isModalOpen="isCreateNewCharacterModalOpen" @modal:close="isCreateNewCharacterModalOpen = false" :modal-width="430" :modal-height="275">
+    <template #modalHeader>
+      <h3 class="m-0 font-medium text-white">Create your character</h3>
+    </template>
+
+    <template #modalBody>
+      <div class="p-4 h-[calc(100%_-_32px)]">
+        <form method="post" @submit.prevent="createCharacter" class="h-full flex flex-col justify-between">
+          <div class="form-field-full">
+            <label for="name" class="text-white">Nickname</label>
+            <input class="input-field" v-model="newCharacterName" name="name" id="name" placeholder="Enter a nickname..." />
+          </div>
+          <div class="grid grid-flow-col justify-stretch gap-4">
+            <button type="button" class="btn-empty py-1.5 px-4 inline-block" @click.prevent="isCreateNewCharacterModalOpen = false">Cancel</button>
+            <button class="btn-cyan py-1.5 px-4 inline-block" type="submit">Create</button>
+          </div>
+        </form>
+      </div>
+    </template>
+  </Modal>
 </template>
 
 <script setup lang="ts">
 import config from '@/application/config'
-import { SocketEvent } from '@/application/enums'
 import { type CharacterHair, type Character as CharacterT, type Map } from '@/application/types'
+import Modal from '@/components/utilities/Modal.vue'
 import { useSoundComposable } from '@/composables/useSoundComposable'
-import { socketManager } from '@/managers/SocketManager'
+import { CharacterHairStorage } from '@/storage/storages'
-import { CharacterHairStorage, CharacterTypeStorage } from '@/storage/storages'
 import { useGameStore } from '@/stores/gameStore'
-import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
+import { onBeforeUnmount, onMounted, ref, watch } from 'vue'
-
-const characterCreationSettings = {
-  maxCharacters: 4,
-  minNameLength: 3,
-  maxNameLength: 20,
-  defaultGender: 'MALE' as const
-}
 
 const { playSound } = useSoundComposable()
 const gameStore = useGameStore()
 const isLoading = ref<boolean>(true)
 const characters = ref<CharacterT[]>([])
 const selectedCharacterId = ref<string | null>(null)
-const newNickname = ref<string>('')
+const isCreateNewCharacterModalOpen = ref<boolean>(false)
 const newCharacterName = ref<string>('')
 const characterHairs = ref<CharacterHair[]>([])
 const selectedHairId = ref<string | null>(null)
-const defaultCharacterTypeId = ref<string>('')
-const isCreatingCharacter = ref<boolean>(false)
-const selectedGender = ref()
-
-const selectedHairColor = ref<string | null>(null)
-const uniqueHairColors = computed(() => {
-  return [...new Set(characterHairs.value.map((hair) => hair.color))]
-})
-
-const filteredHairs = computed(() => {
-  if (!selectedHairColor.value) return characterHairs.value
-  return characterHairs.value.filter((hair) => hair.color === selectedHairColor.value)
-})
-
-function getHairColorStyle(color: string | null) {
-  return {
-    backgroundColor: color,
-    border: selectedHairColor.value === color ? '1px solid white' : '1px solid rgba(255, 255, 255, 0.2)'
-  }
-}
-
-function startCharacterCreation() {
-  isCreatingCharacter.value = true
-  selectedCharacterId.value = null
-  newCharacterName.value = ''
-  selectedHairId.value = null
-  selectedHairColor.value = null
-  selectedGender.value = characterCreationSettings.defaultGender
-}
-
-function cancelCharacterCreation() {
-  isCreatingCharacter.value = false
-  newCharacterName.value = ''
-  selectedHairId.value = null
-  selectedHairColor.value = null
-}
 
 // Fetch characters
 setTimeout(() => {
-  socketManager.emit(SocketEvent.CHARACTER_LIST)
+  gameStore.connection?.emit('character:list')
 }, 750)
 
-socketManager.on(SocketEvent.CHARACTER_LIST, (data: any) => {
+gameStore.connection?.on('character:list', (data: any) => {
   characters.value = data
   isLoading.value = false
 })
 
+// Select character logics
 function loginWithCharacter() {
   if (!selectedCharacterId.value) return
 
-  socketManager.emit(
+  gameStore.connection?.emit(
-    SocketEvent.CHARACTER_CONNECT,
+    'character:connect',
     {
       characterId: selectedCharacterId.value,
-      characterHairId: selectedHairId.value,
+      characterHairId: selectedHairId.value
-      newNickname: newNickname.value
     },
     (response: { character: CharacterT; map: Map; characters: CharacterT[] }) => {
       gameStore.setCharacter(response.character)
@@ -222,51 +167,27 @@ function loginWithCharacter() {
 
 // Create character logics
 function createCharacter() {
-  if (newCharacterName.value.length < characterCreationSettings.minNameLength || newCharacterName.value.length > characterCreationSettings.maxNameLength) {
+  gameStore.connection?.emit('character:create', { name: newCharacterName.value }, (success: boolean) => {
-    return
+    if (success) return
-  }
+    isCreateNewCharacterModalOpen.value = false
-
+  })
-  socketManager.emit(
-    SocketEvent.CHARACTER_CREATE,
-    {
-      name: newCharacterName.value,
-      gender: selectedGender.value,
-      hairId: selectedHairId.value
-    },
-    (success: boolean) => {
-      if (success) {
-        cancelCharacterCreation()
-        socketManager.emit(SocketEvent.CHARACTER_LIST)
-      }
-    }
-  )
 }
 
 // Watch changes for selected character and update hairs
 watch(selectedCharacterId, (characterId) => {
   if (!characterId) return
-  newNickname.value = ''
+  // selectedHairId.value = characters.value.find((c) => c.id == characterId)?.characterHairId ?? null
-  isCreatingCharacter.value = false
-  selectedHairId.value = characters.value.find((c) => c.id == characterId)?.characterHair ?? null
 })
 
 onMounted(async () => {
-  await playSound('/assets/music/intro.mp3')
+  playSound('/assets/music/intro.mp3')
   const characterHairStorage = new CharacterHairStorage()
-  const characterTypeStorage = new CharacterTypeStorage()
   characterHairs.value = await characterHairStorage.getAll()
-
-  // Get the first available character type for preview
-  const types = await characterTypeStorage.getAll()
-  const defaultType = types.find((type) => type.isSelectable)
-  if (defaultType) {
-    defaultCharacterTypeId.value = defaultType.id
-  }
 })
 
 onBeforeUnmount(() => {
-  socketManager.off(SocketEvent.CHARACTER_LIST)
+  gameStore.connection?.off('character:list')
-  socketManager.off(SocketEvent.CHARACTER_CONNECT)
+  gameStore.connection?.off('character:connect')
-  socketManager.off(SocketEvent.CHARACTER_CREATE)
+  gameStore.connection?.off('character:create:success')
 })
 </script>

src/components/screens/Login.vue

@@ -44,4 +44,13 @@ function switchToLogin() {
   currentForm.value = 'login'
   doesUrlHaveToken.value = false
 }
+
+// automatic login because of development
+onMounted(async () => {
+  const token = useCookies().get('token')
+  if (token) {
+    gameStore.setToken(token)
+    gameStore.initConnection()
+  }
+})
 </script>

src/components/screens/MapEditor.vue

@@ -5,10 +5,10 @@
         <div v-if="!isLoaded" class="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 text-white text-3xl font-ui">Loading...</div>
         <div v-else>
           <Map v-if="mapEditor.currentMap.value" :key="mapEditor.currentMap.value?.id" />
-          <Toolbar ref="toolbar" @save="save" @clear="clear" @open-maps="mapModal?.open" @open-settings="mapSettingsModal?.open" @open-teleport="teleportModal?.open" />
+          <Toolbar ref="toolbar" @save="save" @clear="clear" @open-maps="mapModal?.open" @open-settings="mapSettingsModal?.open" @close-editor="mapEditor.toggleActive" />
           <MapList ref="mapModal" @open-create-map="mapSettingsModal?.open" />
-          <TileList />
+          <TileList v-if="mapEditor.tool.value === 'pencil' && mapEditor.drawMode.value === 'tile'" />
-          <MapObjectList />
+          <MapObjectList v-if="mapEditor.tool.value === 'pencil' && mapEditor.drawMode.value === 'map_object'" />
           <MapSettings ref="mapSettingsModal" />
           <TeleportModal ref="teleportModal" />
         </div>
@@ -19,11 +19,8 @@
 
 <script setup lang="ts">
 import config from '@/application/config'
-import { SocketEvent } from '@/application/enums'
-import { socketManager } from '@/managers/SocketManager'
 import 'phaser'
 import type { Map as MapT } from '@/application/types'
-import { downloadCache } from '@/application/utilities'
 import Map from '@/components/gameMaster/mapEditor/Map.vue'
 import MapList from '@/components/gameMaster/mapEditor/partials/MapList.vue'
 import MapObjectList from '@/components/gameMaster/mapEditor/partials/MapObjectList.vue'
@@ -34,14 +31,16 @@ import Toolbar from '@/components/gameMaster/mapEditor/partials/Toolbar.vue'
 import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
 import { loadAllTileTextures } from '@/services/mapService'
 import { MapStorage } from '@/storage/storages'
+import { useGameStore } from '@/stores/gameStore'
 import { Game, Scene } from 'phavuer'
-import { ref, toRaw, useTemplateRef } from 'vue'
+import { ref, useTemplateRef } from 'vue'
 
+const mapStorage = new MapStorage()
 const mapEditor = useMapEditorComposable()
+const gameStore = useGameStore()
 
 const mapModal = useTemplateRef('mapModal')
 const mapSettingsModal = useTemplateRef('mapSettingsModal')
-const teleportModal = useTemplateRef('teleportModal')
 
 const isLoaded = ref(false)
 
@@ -82,18 +81,24 @@ const preloadScene = async (scene: Phaser.Scene) => {
   })
 }
 
-async function save() {
+function save() {
-  const currentMap = toRaw(mapEditor.currentMap.value)
+  const currentMap = mapEditor.currentMap.value
   if (!currentMap) return
 
   const data = {
-    ...currentMap,
+    mapId: currentMap.id,
-    mapId: currentMap.id
+    name: currentMap.name,
+    width: currentMap.width,
+    height: currentMap.height,
+    tiles: currentMap.tiles,
+    pvp: currentMap.pvp,
+    mapEffects: currentMap.mapEffects,
+    mapEventTiles: currentMap.mapEventTiles,
+    placedMapObjects: currentMap.placedMapObjects.map(({ id, mapObject, isRotated, positionX, positionY }) => ({ id, mapObject, isRotated, positionX, positionY })) ?? []
   }
 
-  socketManager.emit(SocketEvent.GM_MAP_UPDATE, data, async (response: MapT) => {
+  gameStore.connection?.emit('gm:map:update', data, (response: MapT) => {
-    if (!response.id) return
+    mapStorage.update(response.id, response)
-    await downloadCache('maps', new MapStorage())
   })
 }
 
@@ -101,6 +106,7 @@ function clear() {
   if (!mapEditor.currentMap.value) return
 
   // Clear placed objects, event tiles and tiles
+  mapEditor.clearMap()
   mapEditor.triggerClearTiles()
 }
 </script>

src/components/utilities/Accordion.vue

@@ -0,0 +1,22 @@
+<template>
+  <div class="mb-4 flex flex-col gap-3">
+    <div @click="toggle" class="p-3 bg-gray-300 bg-opacity-50 rounded hover:bg-gray-400 text-white font-default cursor-pointer">
+      <slot name="header" />
+    </div>
+    <transition enter-active-class="transition-all duration-300 ease-in-out" leave-active-class="transition-all duration-300 ease-in-out" enter-from-class="opacity-0 max-h-0" enter-to-class="opacity-100 max-h-96" leave-from-class="opacity-100 max-h-96" leave-to-class="opacity-0 max-h-0">
+      <div v-if="isOpen" class="overflow-hidden">
+        <slot name="content" />
+      </div>
+    </transition>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+
+const isOpen = ref(false)
+
+const toggle = () => {
+  isOpen.value = !isOpen.value
+}
+</script>

src/components/utilities/BackgroundImageLoader.vue

@@ -0,0 +1,23 @@
+<template>
+  <div style="display: none">
+    <img v-for="(url, index) in imageUrls" :key="index" :src="url" alt="" @load="handleImageLoad(index)" @error="handleImageError(index)" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+
+// Internal array of images to preload
+const imageUrls = ref<string[]>(['/assets/ui-elements/button-ui-box-textured.svg', '/assets/ui-elements/button-ui-frame-empty.svg', '/assets/ui-elements/button-ui-box-textured-small.svg'])
+
+const loadedImages = ref<Set<number>>(new Set())
+
+const handleImageLoad = (index: number) => {
+  loadedImages.value.add(index)
+  console.log(`Image ${index} loaded:`, imageUrls.value[index])
+}
+
+const handleImageError = (index: number) => {
+  console.log(`Image ${index} failed to load:`, imageUrls.value[index])
+}
+</script>

src/components/utilities/Debug.vue

@@ -1,14 +1,18 @@
 <template></template>
 
 <script setup lang="ts">
-import { socketManager } from '@/managers/SocketManager'
+import {
-import { login } from '@/services/authenticationService'
+  CharacterHairStorage,
-import { CharacterHairStorage, CharacterTypeStorage, MapObjectStorage, MapStorage, SoundStorage, SpriteStorage, TileStorage } from '@/storage/storages'
+  CharacterTypeStorage,
+  MapObjectStorage,
+  MapStorage,
+  SoundStorage,
+  SpriteStorage,
+  TileStorage
+} from '@/storage/storages'
 import { TextureStorage } from '@/storage/textureStorage'
-import { useGameStore } from '@/stores/gameStore'
 import { onMounted, onUnmounted } from 'vue'
 
-const gameStore = useGameStore()
 const mapStorage = new MapStorage()
 const tileStorage = new TileStorage()
 const mapObjectStorage = new MapObjectStorage()
@@ -41,17 +45,6 @@ async function handleKeyPress(event: KeyboardEvent) {
     currentString = '' // Reset
   }
 
-  if (currentString.includes('11')) {
-    if (socketManager.token) return
-    const response = await login('root', 'password')
-
-    if (response.success === undefined) {
-      return
-    }
-    socketManager.setToken(response.token)
-    gameStore.initConnection()
-  }
-
   // Reset string after a certain amount of time
   setTimeout(() => {
     currentString = ''

src/components/utilities/Notifications.vue

@@ -10,11 +10,9 @@
 </template>
 
 <script setup lang="ts">
-import { SocketEvent } from '@/application/enums'
 import Modal from '@/components/utilities/Modal.vue'
-import { socketManager } from '@/managers/SocketManager'
 import { useGameStore } from '@/stores/gameStore'
-import { onMounted, onUnmounted, watch } from 'vue'
+import { onBeforeMount, onBeforeUnmount, onMounted, onUnmounted, watch } from 'vue'
 
 const gameStore = useGameStore()
 
@@ -28,7 +26,7 @@ type Notification = {
 }
 
 function setupNotificationListener(connection: any) {
-  connection.on(SocketEvent.NOTIFICATION, (data: Notification) => {
+  connection.on('notification', (data: Notification) => {
     gameStore.addNotification({
       title: data.title,
       message: data.message
@@ -37,13 +35,13 @@ function setupNotificationListener(connection: any) {
 }
 
 onMounted(() => {
-  const connection = socketManager.connection
+  const connection = gameStore.connection
   if (connection) {
     setupNotificationListener(connection)
   } else {
     // Watch for changes in the socket connection
     watch(
-      () => socketManager.connection,
+      () => gameStore.connection,
       (newConnection) => {
         if (newConnection) setupNotificationListener(newConnection)
       }
@@ -52,9 +50,9 @@ onMounted(() => {
 })
 
 onUnmounted(() => {
-  const connection = socketManager.connection
+  const connection = gameStore.connection
   if (connection) {
-    connection.off(SocketEvent.NOTIFICATION)
+    connection.off('notification')
   }
 })
 </script>

src/composables/controls/useGameControlsComposable.ts

@@ -1,5 +1,3 @@
-import { SocketEvent } from '@/application/enums'
-import { socketManager } from '@/managers/SocketManager'
 import { getTile } from '@/services/mapService'
 import { useGameStore } from '@/stores/gameStore'
 import type { Ref } from 'vue'
@@ -8,77 +6,7 @@ import { useBaseControlsComposable } from './useBaseControlsComposable'
 export function useGameControlsComposable(scene: Phaser.Scene, layer: Phaser.Tilemaps.TilemapLayer, waypoint: Ref<{ visible: boolean; x: number; y: number }>, camera: Phaser.Cameras.Scene2D.Camera) {
   const gameStore = useGameStore()
   const baseHandlers = useBaseControlsComposable(scene, layer, waypoint, camera)
-  const pressedKeys = new Set<string>()
 
-  let moveTimeout: NodeJS.Timeout | null = null
-  let currentPosition = {
-    x: 0,
-    y: 0
-  }
-
-  // Movement constants
-  const MOVEMENT_DELAY = 110 // Milliseconds between moves
-  const ARROW_KEYS = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'] as const
-
-  function updateCurrentPosition() {
-    if (!gameStore.character) return
-    currentPosition = {
-      x: gameStore.character.positionX,
-      y: gameStore.character.positionY
-    }
-  }
-
-  function calculateNewPosition() {
-    let newX = currentPosition.x
-    let newY = currentPosition.y
-
-    if (pressedKeys.has('ArrowLeft')) newX--
-    if (pressedKeys.has('ArrowRight')) newX++
-    if (pressedKeys.has('ArrowUp')) newY--
-    if (pressedKeys.has('ArrowDown')) newY++
-
-    return { newX, newY }
-  }
-
-  function emitMovement(x: number, y: number) {
-    if (x === currentPosition.x && y === currentPosition.y) return
-
-    socketManager.emit(SocketEvent.MAP_CHARACTER_MOVE, [x, y])
-    socketManager.on(SocketEvent.MAP_CHARACTER_MOVE, ([characterId, posX, posY, rot, isMoving]: [string, number, number, number, boolean]) => {
-      if (characterId !== gameStore.character?.id) return
-      currentPosition = { x: posX, y: posY }
-    })
-
-    currentPosition = { x, y }
-  }
-
-  function startMovementLoop() {
-    if (moveTimeout) return
-
-    const move = () => {
-      if (pressedKeys.size === 0) {
-        stopMovementLoop()
-        return
-      }
-
-      updateCurrentPosition()
-      const { newX, newY } = calculateNewPosition()
-      emitMovement(newX, newY)
-
-      moveTimeout = setTimeout(move, MOVEMENT_DELAY)
-    }
-
-    move()
-  }
-
-  function stopMovementLoop() {
-    if (moveTimeout) {
-      clearTimeout(moveTimeout)
-      moveTimeout = null
-    }
-  }
-
-  // Pointer Handlers
   function handlePointerDown(pointer: Phaser.Input.Pointer) {
     baseHandlers.startDragging(pointer)
   }
@@ -94,37 +22,77 @@ export function useGameControlsComposable(scene: Phaser.Scene, layer: Phaser.Til
     const pointerTile = getTile(layer, pointer.worldX, pointer.worldY)
     if (!pointerTile) return
 
-    emitMovement(pointerTile.x, pointerTile.y)
+    gameStore.connection?.emit('map:character:move', {
+      positionX: pointerTile.x,
+      positionY: pointerTile.y
+    })
   }
 
-  // Keyboard Handlers
+  const pressedKeys = new Set<string>()
+  let moveInterval: number | null = null
+
   function handleKeyDown(event: KeyboardEvent) {
     if (!gameStore.character) return
 
-    if (ARROW_KEYS.includes(event.key as (typeof ARROW_KEYS)[number])) {
+    // console.log(event.key)
-      if (event.repeat) return
 
+    if (['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'].includes(event.key)) {
       pressedKeys.add(event.key)
-      updateCurrentPosition()
+
-      startMovementLoop()
+      // Start movement loop if not already running
+      if (!moveInterval) {
+        moveInterval = window.setInterval(moveCharacter, 100) // Adjust timing as needed
+        moveCharacter() // Move immediately on first press
+      }
     }
 
+    // Attack on CTRL
     if (event.key === 'Control') {
-      socketManager.emit(SocketEvent.MAP_CHARACTER_ATTACK)
+      gameStore.connection?.emit('map:character:attack')
     }
   }
 
   function handleKeyUp(event: KeyboardEvent) {
     pressedKeys.delete(event.key)
 
-    if (pressedKeys.size === 0) {
+    // If no movement keys are pressed, clear the interval
-      stopMovementLoop()
+    if (pressedKeys.size === 0 && moveInterval) {
+      clearInterval(moveInterval)
+      moveInterval = null
+    }
+  }
+
+  function moveCharacter() {
+    if (!gameStore.character) return
+    const { positionX, positionY } = gameStore.character
+
+    if (pressedKeys.has('ArrowLeft')) {
+      gameStore.connection?.emit('map:character:move', {
+        positionX: positionX - 1,
+        positionY: positionY
+      })
+    }
+    if (pressedKeys.has('ArrowRight')) {
+      gameStore.connection?.emit('map:character:move', {
+        positionX: positionX + 1,
+        positionY: positionY
+      })
+    }
+    if (pressedKeys.has('ArrowUp')) {
+      gameStore.connection?.emit('map:character:move', {
+        positionX: positionX,
+        positionY: positionY - 1
+      })
+    }
+    if (pressedKeys.has('ArrowDown')) {
+      gameStore.connection?.emit('map:character:move', {
+        positionX: positionX,
+        positionY: positionY + 1
+      })
     }
   }
 
   const setupControls = () => {
-    updateCurrentPosition() // Initialize position
-
     scene.input.on(Phaser.Input.Events.POINTER_DOWN, handlePointerDown)
     scene.input.on(Phaser.Input.Events.POINTER_MOVE, handlePointerMove)
     scene.input.on(Phaser.Input.Events.POINTER_UP, handlePointerUp)
@@ -134,9 +102,6 @@ export function useGameControlsComposable(scene: Phaser.Scene, layer: Phaser.Til
   }
 
   const cleanupControls = () => {
-    stopMovementLoop()
-    pressedKeys.clear()
-
     scene.input.off(Phaser.Input.Events.POINTER_DOWN, handlePointerDown)
     scene.input.off(Phaser.Input.Events.POINTER_MOVE, handlePointerMove)
     scene.input.off(Phaser.Input.Events.POINTER_UP, handlePointerUp)

src/composables/useCharacterSpriteComposable.ts

@@ -1,9 +1,9 @@
 import config from '@/application/config'
 import { Direction } from '@/application/enums'
-import { type MapCharacter, type SpriteAction } from '@/application/types'
+import { type MapCharacter } from '@/application/types'
 import { calculateIsometricDepth, tileToWorldX, tileToWorldY } from '@/services/mapService'
 import { loadSpriteTextures } from '@/services/textureService'
-import { CharacterTypeStorage, SpriteStorage } from '@/storage/storages'
+import { CharacterTypeStorage } from '@/storage/storages'
 import { refObj } from 'phavuer'
 import { computed, ref } from 'vue'
 
@@ -18,7 +18,7 @@ export function useCharacterSpriteComposable(scene: Phaser.Scene, tilemap: Phase
   const tween = ref<Phaser.Tweens.Tween | null>(null)
 
   const updateIsometricDepth = (positionX: number, positionY: number) => {
-    isometricDepth.value = calculateIsometricDepth(positionX, positionY)
+    isometricDepth.value = calculateIsometricDepth(positionX, positionY, 30, 95, true)
   }
 
   const updatePosition = (positionX: number, positionY: number) => {
@@ -72,7 +72,7 @@ export function useCharacterSpriteComposable(scene: Phaser.Scene, tilemap: Phase
     // Add new listener
     characterSprite.value.on(Phaser.Animations.Events.ANIMATION_COMPLETE, () => {
       characterSprite.value!.setFrame(0)
-      characterSprite.value!.setTexture(spriteSpriteActionId.value)
+      characterSprite.value!.setTexture(charTexture.value)
     })
 
     characterSprite.value.anims.play(
@@ -96,23 +96,11 @@ export function useCharacterSpriteComposable(scene: Phaser.Scene, tilemap: Phase
     return [0, 6].includes(mapCharacter.character.rotation ?? 0) ? 'left_up' : 'right_down'
   })
 
-  const getSpriteHeightByAction = async (action: string = '') => {
-    if (!characterSpriteId.value) return 0
-    const spriteStorage = new SpriteStorage()
-    const sprite = await spriteStorage.getById(characterSpriteId.value)
-    let actionWithDirection = `${currentAction.value}_${currentDirection.value}`
-    if (action) actionWithDirection = action
-
-    return sprite?.spriteActions?.find((spriteAction: SpriteAction) => spriteAction.action === actionWithDirection)?.frameHeight ?? 0
-  }
-
-  const spriteHeight = computed(() => getSpriteHeightByAction(currentAction.value))
-
   const currentAction = computed(() => {
     return mapCharacter.isMoving ? 'walk' : 'idle'
   })
 
-  const spriteSpriteActionId = computed(() => {
+  const charTexture = computed(() => {
     const spriteId = characterSpriteId.value ?? 'idle_right_down'
     return `${spriteId}-${currentAction.value}_${currentDirection.value}`
   })
@@ -121,11 +109,11 @@ export function useCharacterSpriteComposable(scene: Phaser.Scene, tilemap: Phase
     if (!characterSprite.value) return
 
     if (mapCharacter.isMoving) {
-      characterSprite.value.anims.play(spriteSpriteActionId.value, true)
+      characterSprite.value.anims.play(charTexture.value, true)
     } else {
       characterSprite.value.anims.stop()
       characterSprite.value.setFrame(0)
-      characterSprite.value.setTexture(spriteSpriteActionId.value)
+      characterSprite.value.setTexture(charTexture.value)
     }
   }
 
@@ -142,8 +130,7 @@ export function useCharacterSpriteComposable(scene: Phaser.Scene, tilemap: Phase
     }
 
     if (characterSprite.value) {
-      characterSprite!.value?.setOrigin(0.5, 1)
+      characterSprite.value.setTexture(charTexture.value)
-      characterSprite.value.setTexture(spriteSpriteActionId.value)
       characterSprite.value.setFlipX(isFlippedX.value)
     }
 
@@ -159,15 +146,10 @@ export function useCharacterSpriteComposable(scene: Phaser.Scene, tilemap: Phase
     characterContainer,
     characterSpriteId,
     characterSprite,
-    spriteHeight,
-    currentAction,
-    spriteSpriteActionId,
     currentPositionX,
     currentPositionY,
-    currentDirection,
     isometricDepth,
     isFlippedX,
-    getSpriteHeightByAction,
     updatePosition,
     playAnimation,
     calcDirection,

src/composables/useMapEditorComposable.ts

@@ -1,9 +1,8 @@
 import type { Map, MapObject, PlacedMapObject, UUID } from '@/application/types'
-import { useGameStore } from '@/stores/gameStore'
 import { ref } from 'vue'
 
 export type TeleportSettings = {
-  toMap: string
+  toMapId: string
   toPositionX: number
   toPositionY: number
   toRotation: number
@@ -15,13 +14,12 @@ const tool = ref('move')
 const drawMode = ref('tile')
 const inputMode = ref('tap')
 const selectedTile = ref('')
-const isPlacedMapObjectPreviewEnabled = ref(true)
 const selectedMapObject = ref<MapObject | null>(null)
 const movingPlacedObject = ref<PlacedMapObject | null>(null)
 const selectedPlacedObject = ref<PlacedMapObject | null>(null)
 const shouldClearTiles = ref(false)
 const teleportSettings = ref<TeleportSettings>({
-  toMap: '1000',
+  toMapId: '1000',
   toPositionX: 0,
   toPositionY: 0,
   toRotation: 0
@@ -44,15 +42,15 @@ export function useMapEditorComposable() {
     }
   }
 
+  const clearMap = () => {
+    if (!currentMap.value) return
+    currentMap.value.placedMapObjects = []
+    currentMap.value.mapEventTiles = []
+  }
+
   const toggleActive = () => {
     if (active.value) reset()
     active.value = !active.value
-    const gameStore = useGameStore()
-    gameStore.uiSettings.isGmPanelOpen = false
-  }
-
-  const togglePlacedMapObjectPreview = () => {
-    isPlacedMapObjectPreviewEnabled.value = !isPlacedMapObjectPreviewEnabled.value
   }
 
   const setTool = (newTool: string) => {
@@ -96,9 +94,7 @@ export function useMapEditorComposable() {
     drawMode.value = 'tile'
     inputMode.value = 'tap'
     selectedTile.value = ''
-    isPlacedMapObjectPreviewEnabled.value = false
     selectedMapObject.value = null
-    selectedPlacedObject.value = null
     shouldClearTiles.value = false
     refreshMapObject.value = 0
   }
@@ -111,7 +107,6 @@ export function useMapEditorComposable() {
     drawMode,
     inputMode,
     selectedTile,
-    isPlacedMapObjectPreviewEnabled,
     selectedMapObject,
     movingPlacedObject,
     selectedPlacedObject,
@@ -122,12 +117,12 @@ export function useMapEditorComposable() {
     // Methods
     loadMap,
     updateProperty,
+    clearMap,
     toggleActive,
     setTool,
     setDrawMode,
     setInputMode,
     setSelectedTile,
-    togglePlacedMapObjectPreview,
     setSelectedMapObject,
     setTeleportSettings,
     triggerClearTiles,

src/managers/SocketManager.ts

@@ -1,76 +0,0 @@
-import config from '@/application/config'
-import { SocketEvent } from '@/application/enums'
-import { useCookies } from '@vueuse/integrations/useCookies'
-import { io, Socket } from 'socket.io-client'
-import { ref, shallowRef } from 'vue'
-
-class SocketManager {
-  private static instance: SocketManager
-  private _connection = shallowRef<Socket | null>(null)
-  private _token = ref('')
-
-  private constructor() {}
-
-  public static getInstance(): SocketManager {
-    if (!SocketManager.instance) {
-      SocketManager.instance = new SocketManager()
-    }
-    return SocketManager.instance
-  }
-
-  public get connection() {
-    return this._connection.value
-  }
-
-  public get token() {
-    return this._token.value
-  }
-
-  public setToken(token: string) {
-    this._token.value = token
-  }
-
-  public initConnection(): Socket {
-    if (this._connection.value) return this._connection.value
-
-    const socket = io(config.server_endpoint, {
-      secure: config.environment === 'production',
-      withCredentials: true,
-      transports: ['websocket'],
-      reconnectionAttempts: 5
-    })
-
-    this._connection.value = socket
-    return socket
-  }
-
-  public disconnect(): void {
-    if (!this._connection.value) return
-
-    this._connection.value.off(SocketEvent.CONNECT_ERROR)
-    this._connection.value.off(SocketEvent.RECONNECT_FAILED)
-    this._connection.value.off(SocketEvent.DATE)
-    this._connection.value.disconnect()
-
-    useCookies().remove('token', {
-      domain: config.domain
-    })
-
-    this._connection.value = null
-    this._token.value = ''
-  }
-
-  public emit(event: string, ...args: any[]): void {
-    this._connection.value?.emit(event, ...args)
-  }
-
-  public on(event: string, callback: (...args: any[]) => void): void {
-    this._connection.value?.on(event, callback)
-  }
-
-  public off(event: string, callback?: (...args: any[]) => void): void {
-    this._connection.value?.off(event, callback)
-  }
-}
-
-export const socketManager = SocketManager.getInstance()

src/services/mapService.ts

@@ -62,8 +62,12 @@ export function createTileArray(width: number, height: number, tile: string = 'b
   return Array.from({ length: height }, () => Array.from({ length: width }, () => tile))
 }
 
-export const calculateIsometricDepth = (positionX: number, positionY: number) => {
+export const calculateIsometricDepth = (positionX: number, positionY: number, width: number = 0, height: number = 0, isCharacter: boolean = false) => {
-  return positionX + positionY
+  const baseDepth = positionX + positionY
+  if (isCharacter) {
+    return baseDepth
+  }
+  return baseDepth + (width + height) / (2 * config.tile_size.width)
 }
 
 async function loadTileTextures(tiles: TileT[], scene: Phaser.Scene) {
@@ -147,8 +151,3 @@ export function createTileLayer(tileMap: Phaser.Tilemaps.Tilemap, tilesArray: st
 
   return layer
 }
-
-//Recursive Array Clone
-export function cloneArray(arr: any[]): any[] {
-  return arr.map((item) => (item instanceof Array ? cloneArray(item) : item))
-}

src/stores/gameStore.ts

@@ -1,12 +1,15 @@
-import { SocketEvent } from '@/application/enums'
+import config from '@/application/config'
 import type { Character, Notification, User, WorldSettings } from '@/application/types'
-import { socketManager } from '@/managers/SocketManager'
+import { useCookies } from '@vueuse/integrations/useCookies'
 import { defineStore } from 'pinia'
+import { io, Socket } from 'socket.io-client'
 
 export const useGameStore = defineStore('game', {
   state: () => {
     return {
       notifications: [] as Notification[],
+      token: '',
+      connection: null as Socket | null,
       user: null as User | null,
       character: null as Character | null,
       world: {
@@ -47,6 +50,9 @@ export const useGameStore = defineStore('game', {
     removeNotification(id: string) {
       this.notifications = this.notifications.filter((notification: Notification) => notification.id !== id)
     },
+    setToken(token: string) {
+      this.token = token
+    },
     setUser(user: User | null) {
       this.user = user
     },
@@ -66,34 +72,40 @@ export const useGameStore = defineStore('game', {
       this.uiSettings.isCharacterProfileOpen = !this.uiSettings.isCharacterProfileOpen
     },
     initConnection() {
-      const socket = socketManager.initConnection()
+      this.connection = io(config.server_endpoint, {
+        secure: config.environment === 'production',
+        withCredentials: true,
+        transports: ['websocket'],
+        reconnectionAttempts: 5
+      })
 
-      // Handle connect error
+      // #99 - If we can't connect, disconnect
-      socket.on(SocketEvent.CONNECT_ERROR, () => {
+      this.connection.on('connect_error', () => {
         this.disconnectSocket()
       })
 
-      // Handle failed reconnection
+      // Let the server know the user is logged in
-      socket.on(SocketEvent.RECONNECT_FAILED, () => {
+      this.connection.emit('login')
-        this.disconnectSocket()
-      })
 
-      // Emit login event
+      // set user
-      socketManager.emit(SocketEvent.LOGIN)
+      this.connection.on('logged_in', (user: User) => {
-
-      // Handle logged in event
-      socketManager.on(SocketEvent.LOGGED_IN, (user: User) => {
         this.setUser(user)
       })
 
-      // Handle date updates
+      // When we can't reconnect, disconnect
-      socketManager.on(SocketEvent.DATE, (data: Date) => {
+      this.connection.on('reconnect_failed', () => {
-        this.world.date = new Date(data)
+        this.disconnectSocket()
       })
     },
     disconnectSocket() {
-      socketManager.disconnect()
+      this.connection?.disconnect()
 
+      useCookies().remove('token', {
+        domain: config.domain
+      })
+
+      this.connection = null
+      this.token = ''
       this.user = null
       this.character = null
 

src/stores/mapEditorStore.ts

@@ -2,7 +2,7 @@ import type { MapObject, Map as MapT } from '@/application/types'
 import { defineStore } from 'pinia'
 
 export type TeleportSettings = {
-  toMap: string
+  toMapId: string
   toPositionX: number
   toPositionY: number
   toRotation: number
@@ -18,7 +18,7 @@ export const useMapEditorStore = defineStore('mapEditor', {
       selectedMapObject: null as MapObject | null,
       shouldClearTiles: false,
       teleportSettings: {
-        toMap: '',
+        toMapId: '',
         toPositionX: 0,
         toPositionY: 0,
         toRotation: 0

src/stores/mapStore.ts

@@ -5,7 +5,8 @@ export const useMapStore = defineStore('map', {
   state: () => {
     return {
       mapId: '',
-      characters: [] as MapCharacter[]
+      characters: [] as MapCharacter[],
+      characterLoaded: false
     }
   },
   getters: {
@@ -35,18 +36,22 @@ export const useMapStore = defineStore('map', {
     removeCharacter(characterId: UUID) {
       this.characters = this.characters.filter((char) => char.character.id !== characterId)
     },
-    updateCharacterPosition([characterId, posX, posY, rot, isMoving]: [UUID, number, number, number, boolean]) {
+    setCharacterLoaded(loaded: boolean) {
-      const character = this.characters.find((char) => char.character.id === characterId)
+      this.characterLoaded = loaded
+    },
+    updateCharacterPosition(data: { characterId: UUID; positionX: number; positionY: number; rotation: number; isMoving: boolean }) {
+      const character = this.characters.find((char) => char.character.id === data.characterId)
       if (character) {
-        character.character.positionX = posX
+        character.character.positionX = data.positionX
-        character.character.positionY = posY
+        character.character.positionY = data.positionY
-        character.character.rotation = rot
+        character.character.rotation = data.rotation
-        character.isMoving = isMoving
+        character.isMoving = data.isMoving
       }
     },
     reset() {
       this.mapId = ''
       this.characters = []
+      this.characterLoaded = false
     }
   }
 })

vite.config.ts

@@ -2,37 +2,13 @@ import { fileURLToPath, URL } from 'node:url'
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue';
 import viteCompression from 'vite-plugin-compression';
-import {ViteImageOptimizer} from "vite-plugin-image-optimizer";
 
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [
     vue(),
-    viteCompression({
+    viteCompression()
-      algorithm: 'gzip',
-      ext: '.gz',
-      threshold: 10240 // Only compress files larger than 10KB
-    }),
-    ViteImageOptimizer()
   ],
-  build: {
-    minify: 'terser', // Better minification
-    terserOptions: {
-      compress: {
-        drop_console: true, // Remove console.log in production
-        drop_debugger: true
-      }
-    },
-    rollupOptions: {
-      output: {
-        manualChunks: {
-          'vendor': ['vue'], // Split vendor chunks
-          // Add other large dependencies here
-        }
-      }
-    },
-    chunkSizeWarningLimit: 1000, // Increase chunk size warning limit if needed
-  },
   resolve: {
     alias: {
       '@': fileURLToPath(new URL('./src', import.meta.url))