npm run format

Templates for old user panel hadnt been removed yet

.eslintrc.cjs

@@ -1,13 +0,0 @@
-/* eslint-env node */
-require('@rushstack/eslint-patch/modern-module-resolution')
-
-module.exports = {
-  root: true,
-  extends: ['plugin:vue/vue3-essential', 'eslint:recommended', '@vue/eslint-config-typescript', '@vue/eslint-config-prettier/skip-formatting'],
-  parserOptions: {
-    ecmaVersion: 'latest'
-  },
-  rules: {
-    'vue/multi-word-component-names': 'off'
-  }
-}

.vscode/extensions.json

@@ -1,7 +1,6 @@
 {
   "recommendations": [
     "Vue.volar",
-    "dbaeumer.vscode-eslint",
     "esbenp.prettier-vscode"
   ]
 }

package.json

@@ -11,7 +11,6 @@
     "test:unit": "vitest",
     "build-only": "vite build",
     "type-check": "vue-tsc --build --force",
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
     "format": "prettier --write src/"
   },
   "dependencies": {
@@ -28,18 +27,13 @@
   },
   "devDependencies": {
     "@ianvs/prettier-plugin-sort-imports": "^4.4.0",
-    "@rushstack/eslint-patch": "^1.10.3",
     "@tsconfig/node20": "^20.1.4",
     "@types/jsdom": "^21.1.7",
     "@types/node": "^20.14.11",
     "@vitejs/plugin-vue": "^5.0.5",
-    "@vue/eslint-config-prettier": "^9.0.0",
-    "@vue/eslint-config-typescript": "^13.0.0",
     "@vue/test-utils": "^2.4.6",
     "@vue/tsconfig": "^0.5.1",
     "autoprefixer": "^10.4.19",
-    "eslint": "^8.57.0",
-    "eslint-plugin-vue": "^9.27.0",
     "jsdom": "^24.1.1",
     "npm-run-all2": "^6.2.3",
     "phaser3-rex-plugins": "^1.80.8",

src/App.vue

@@ -2,7 +2,7 @@
   <Debug />
   <Notifications />
   <BackgroundImageLoader />
-  <GmPanel v-if="gameStore.character?.role === 'gm'" />
+  <GmPanel v-if="gameStore.character?.role === 'gm'" @open-map-editor="mapEditor.toggleActive" />
   <component :is="currentScreen" />
 </template>
 
@@ -16,34 +16,33 @@ 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 { useGameStore } from '@/stores/gameStore'
 import { useMapEditorStore } from '@/stores/mapEditorStore'
-import { computed, onMounted, onUnmounted, watch } from 'vue'
+import { computed, ref, useTemplateRef, watch } from 'vue'
 
 const gameStore = useGameStore()
-const mapEditorStore = useMapEditorStore()
+const mapEditor = useMapEditorComposable()
 
 const currentScreen = computed(() => {
   if (!gameStore.game.isLoaded) return Loading
   if (!gameStore.connection) return Login
   if (!gameStore.token) return Login
   if (!gameStore.character) return Characters
-  if (mapEditorStore.active) return MapEditor
+  if (mapEditor.active.value) return MapEditor
   return Game
 })
 
-// Watch mapEditorStore.active and empty gameStore.game.loadedAssets
+// Watch mapEditor.active and empty gameStore.game.loadedAssets
 watch(
-  () => mapEditorStore.active,
+  () => mapEditor.active.value,
   () => {
     gameStore.game.loadedTextures = []
   }
 )
 
 // #209: Play sound when a button is pressed
-/**
- * @TODO: Not all button-like elements will actually be a button, so we need to find a better way to do this
- */
+// @TODO: Not all button-like elements will actually be a button, so we need to find a better way to do this
 addEventListener('click', (event) => {
   if (!(event.target instanceof HTMLButtonElement)) {
     return
@@ -57,7 +56,9 @@ addEventListener('keydown', (event) => {
   if (gameStore.character?.role !== 'gm') return // Only allow toggling the gm panel if the character is a gm
 
   // Check if no input is active or focus is on an input
-  if (event.repeat || event.isComposing || event.defaultPrevented || document.activeElement?.tagName.toUpperCase() === 'INPUT' || document.activeElement?.tagName.toUpperCase() === 'TEXTAREA') return
+  if (event.repeat || event.isComposing || event.defaultPrevented || document.activeElement?.tagName.toUpperCase() === 'INPUT' || document.activeElement?.tagName.toUpperCase() === 'TEXTAREA') {
+    return
+  }
 
   if (event.key === 'G') {
     gameStore.toggleGmPanel()

src/application/enums.ts

@@ -0,0 +1,5 @@
+export enum Direction {
+  POSITIVE,
+  NEGATIVE,
+  UNCHANGED
+}

src/application/types.ts

@@ -19,7 +19,6 @@ export type TextureData = {
   updatedAt: Date
   originX?: number
   originY?: number
-  isAnimated?: boolean
   frameRate?: number
   frameWidth?: number
   frameHeight?: number
@@ -40,7 +39,6 @@ export type MapObject = {
   tags: any | null
   originX: number
   originY: number
-  isAnimated: boolean
   frameRate: number
   frameWidth: number
   frameHeight: number
@@ -68,7 +66,7 @@ export type Map = {
   name: string
   width: number
   height: number
-  tiles: any | null
+  tiles: string[][]
   pvp: boolean
   mapEffects: MapEffect[]
   mapEventTiles: MapEventTile[]
@@ -105,7 +103,7 @@ export enum MapEventTileType {
 
 export type MapEventTile = {
   id: UUID
-  map: Map
+  mapId: UUID
   type: MapEventTileType
   positionX: number
   positionY: number
@@ -185,6 +183,7 @@ export type Character = {
 export type MapCharacter = {
   character: Character
   isMoving: boolean
+  isAttacking?: boolean
 }
 
 export type CharacterItem = {
@@ -218,22 +217,28 @@ export type Sprite = {
   characterTypes: CharacterType[]
 }
 
+export interface SpriteImage {
+  url: string
+  offset: {
+    x: number
+    y: number
+  }
+}
+
 export type SpriteAction = {
-  id: UUID
-  sprite: Sprite
+  id: string
+  sprite: string
   action: string
-  sprites: string[]
+  sprites: SpriteImage[]
   originX: number
   originY: number
-  isAnimated: boolean
-  isLooping: boolean
   frameWidth: number
   frameHeight: number
   frameRate: number
 }
 
 export type Chat = {
-  id: UUID
+  id: string
   character: Character
   map: Map
   message: string
@@ -242,15 +247,11 @@ export type Chat = {
 
 export type WorldSettings = {
   date: Date
-  isRainEnabled: boolean
-  isFogEnabled: boolean
-  fogDensity: number
+  weatherState: WeatherState
 }
 
 export type WeatherState = {
-  isRainEnabled: boolean
   rainPercentage: number
-  isFogEnabled: boolean
   fogDensity: number
 }
 

src/application/utilities.ts

@@ -1,3 +1,7 @@
+import config from '@/application/config'
+import type { HttpResponse } from '@/application/types'
+import type { BaseStorage } from '@/storage/baseStorage'
+
 export function uuidv4() {
   return '10000000-1000-4000-8000-100000000000'.replace(/[018]/g, (c) => (+c ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (+c / 4)))).toString(16))
 }
@@ -23,3 +27,26 @@ export function getDomain() {
 
   return window.location.hostname.split('.').slice(-2).join('.')
 }
+
+export async function downloadCache<T extends { id: string; updatedAt: Date }>(endpoint: string, storage: BaseStorage<T>) {
+  const request = await fetch(`${config.server_endpoint}/cache/${endpoint}`)
+  const response = (await request.json()) as HttpResponse<T[]>
+
+  if (!response.success) {
+    console.error(`Failed to download ${endpoint}:`, response.message)
+    return
+  }
+
+  const items = response.data ?? []
+
+  for (const item of items) {
+    let overwrite = false
+    const existingItem = await storage.get(item.id)
+
+    if (!existingItem || item.updatedAt > existingItem.updatedAt) {
+      overwrite = true
+    }
+
+    await storage.add(item, overwrite)
+  }
+}

src/components/Effects.vue

@@ -1,179 +0,0 @@
-<template>
-  <Scene name="effects" @preload="preloadScene" @create="createScene" @update="updateScene" />
-</template>
-
-<script setup lang="ts">
-import type { WeatherState } from '@/application/types'
-import { useGameStore } from '@/stores/gameStore'
-import { useMapStore } from '@/stores/mapStore'
-import { Scene } from 'phavuer'
-import { onBeforeUnmount, onMounted, ref, watch } from 'vue'
-
-// Constants
-const LIGHT_CONFIG = {
-  SUNRISE_HOUR: 6,
-  SUNSET_HOUR: 20,
-  DAY_STRENGTH: 100,
-  NIGHT_STRENGTH: 30
-}
-
-// Stores and refs
-const gameStore = useGameStore()
-const mapStore = useMapStore()
-const sceneRef = ref<Phaser.Scene | null>(null)
-const mapEffectsReady = ref(false)
-
-// Effect objects
-const effects = {
-  light: ref<Phaser.GameObjects.Graphics | null>(null),
-  rain: ref<Phaser.GameObjects.Particles.ParticleEmitter | null>(null),
-  fog: ref<Phaser.GameObjects.Sprite | null>(null)
-}
-
-// Weather state
-const weatherState = ref<WeatherState>({
-  isRainEnabled: false,
-  rainPercentage: 0,
-  isFogEnabled: false,
-  fogDensity: 0
-})
-
-// Scene setup
-const preloadScene = (scene: Phaser.Scene) => {
-  scene.load.image('raindrop', 'assets/raindrop.png')
-  scene.load.image('fog', 'assets/fog.png')
-}
-
-const createScene = (scene: Phaser.Scene) => {
-  sceneRef.value = scene
-  initializeEffects(scene)
-  setupSocketListeners()
-}
-
-const initializeEffects = (scene: Phaser.Scene) => {
-  // Light
-  effects.light.value = scene.add.graphics().setDepth(1000)
-
-  // Rain
-  effects.rain.value = scene.add
-    .particles(0, 0, 'raindrop', {
-      x: { min: 0, max: window.innerWidth },
-      y: -50,
-      quantity: 5,
-      lifespan: 2000,
-      speedY: { min: 300, max: 500 },
-      scale: { start: 0.005, end: 0.005 },
-      alpha: { start: 0.5, end: 0 },
-      blendMode: 'ADD'
-    })
-    .setDepth(900)
-  effects.rain.value.stop()
-
-  // Fog
-  effects.fog.value = scene.add
-    .sprite(window.innerWidth / 2, window.innerHeight / 2, 'fog')
-    .setScale(2)
-    .setAlpha(0)
-    .setDepth(950)
-}
-
-// Effect updates
-const updateScene = () => {
-  const timeBasedLight = calculateLightStrength(gameStore.world.date)
-  const mapEffects = mapStore.map?.mapEffects?.reduce(
-    (acc, curr) => ({
-      ...acc,
-      [curr.effect]: curr.strength
-    }),
-    {}
-  ) as { [key: string]: number }
-
-  // Only update effects once mapEffects are loaded
-  if (!mapEffectsReady.value) {
-    if (mapEffects && Object.keys(mapEffects).length) {
-      mapEffectsReady.value = true
-    } else {
-      return
-    }
-  }
-
-  const finalEffects =
-    mapEffects && Object.keys(mapEffects).length
-      ? mapEffects
-      : {
-          light: timeBasedLight,
-          rain: weatherState.value.isRainEnabled ? weatherState.value.rainPercentage : 0,
-          fog: weatherState.value.isFogEnabled ? weatherState.value.fogDensity * 100 : 0
-        }
-
-  applyEffects(finalEffects)
-}
-
-const applyEffects = (effectValues: any) => {
-  if (effects.light.value) {
-    const darkness = 1 - (effectValues.light ?? 100) / 100
-    effects.light.value.clear().fillStyle(0x000000, darkness).fillRect(0, 0, window.innerWidth, window.innerHeight)
-  }
-
-  if (effects.rain.value) {
-    const strength = effectValues.rain ?? 0
-    strength > 0 ? effects.rain.value.start().setQuantity(Math.floor((strength / 100) * 10)) : effects.rain.value.stop()
-  }
-
-  if (effects.fog.value) {
-    effects.fog.value.setAlpha((effectValues.fog ?? 0) / 100)
-  }
-}
-
-const calculateLightStrength = (time: Date): number => {
-  const hour = time.getHours()
-  const minute = time.getMinutes()
-
-  if (hour >= LIGHT_CONFIG.SUNSET_HOUR || hour < LIGHT_CONFIG.SUNRISE_HOUR) return LIGHT_CONFIG.NIGHT_STRENGTH
-
-  if (hour > LIGHT_CONFIG.SUNRISE_HOUR && hour < LIGHT_CONFIG.SUNSET_HOUR - 2) return LIGHT_CONFIG.DAY_STRENGTH
-
-  if (hour === LIGHT_CONFIG.SUNRISE_HOUR) return LIGHT_CONFIG.NIGHT_STRENGTH + ((LIGHT_CONFIG.DAY_STRENGTH - LIGHT_CONFIG.NIGHT_STRENGTH) * minute) / 60
-
-  const totalMinutes = (hour - (LIGHT_CONFIG.SUNSET_HOUR - 2)) * 60 + minute
-  return LIGHT_CONFIG.DAY_STRENGTH - (LIGHT_CONFIG.DAY_STRENGTH - LIGHT_CONFIG.NIGHT_STRENGTH) * (totalMinutes / 120)
-}
-
-// Socket and window handlers
-const setupSocketListeners = () => {
-  gameStore.connection?.emit('weather', (response: WeatherState) => {
-    weatherState.value = response
-    updateScene()
-  })
-
-  gameStore.connection?.on('weather', (data: WeatherState) => {
-    weatherState.value = data
-    updateScene()
-  })
-
-  gameStore.connection?.on('date', updateScene)
-}
-
-const handleResize = () => {
-  if (effects.rain.value) effects.rain.value.updateConfig({ x: { min: 0, max: window.innerWidth } })
-  if (effects.fog.value) effects.fog.value.setPosition(window.innerWidth / 2, window.innerHeight / 2)
-}
-
-// Lifecycle
-watch(
-  () => mapStore.map,
-  () => {
-    mapEffectsReady.value = false
-    updateScene()
-  },
-  { deep: true }
-)
-
-onMounted(() => window.addEventListener('resize', handleResize))
-
-onBeforeUnmount(() => {
-  window.removeEventListener('resize', handleResize)
-  if (sceneRef.value) sceneRef.value.scene.remove('effects')
-  gameStore.connection?.off('weather')
-})
-</script>

src/components/game/character/Character.vue

@@ -1,131 +1,45 @@
 <template>
-  <ChatBubble :mapCharacter="props.mapCharacter" :currentX="currentPositionX" :currentY="currentPositionY" />
-  <Healthbar :mapCharacter="props.mapCharacter" :currentX="currentPositionX" :currentY="currentPositionY" />
-  <Container ref="charContainer" :depth="isometricDepth" :x="currentPositionX" :y="currentPositionY">
-    <!--    <CharacterHair :mapCharacter="props.mapCharacter" :currentX="currentX" :currentY="currentY" />-->
-    <!--    <CharacterChest :mapCharacter="props.mapCharacter" :currentX="currentX" :currentY="currentY" />-->
-    <Sprite ref="charSprite" :origin-y="1" :flipX="isFlippedX" />
+  <Container ref="characterContainer" :x="currentPositionX" :y="currentPositionY" :depth="isometricDepth">
+    <ChatBubble :mapCharacter="props.mapCharacter" />
+    <HealthBar :mapCharacter="props.mapCharacter" />
+    <CharacterHair :mapCharacter="props.mapCharacter" />
+    <Sprite ref="characterSprite" :origin-y="1" :flipX="isFlippedX" />
   </Container>
 </template>
 
 <script lang="ts" setup>
-import config from '@/application/config'
-import { type MapCharacter, type Sprite as SpriteT } from '@/application/types'
+import { Direction } from '@/application/enums'
+import { type MapCharacter } from '@/application/types'
 import CharacterHair from '@/components/game/character/partials/CharacterHair.vue'
 import ChatBubble from '@/components/game/character/partials/ChatBubble.vue'
-import Healthbar from '@/components/game/character/partials/Healthbar.vue'
-import { loadSpriteTextures } from '@/composables/gameComposable'
-import { calculateIsometricDepth, tileToWorldX, tileToWorldY } from '@/composables/mapComposable'
-import { CharacterTypeStorage } from '@/storage/storages'
+import HealthBar from '@/components/game/character/partials/HealthBar.vue'
+import { useCharacterSprite } from '@/composables/useCharacterSpriteComposable'
 import { useGameStore } from '@/stores/gameStore'
 import { useMapStore } from '@/stores/mapStore'
-import { Container, refObj, Sprite, useScene } from 'phavuer'
-import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
-
-// import CharacterChest from '@/components/game/character/partials/CharacterChest.vue'
-
-enum Direction {
-  POSITIVE,
-  NEGATIVE,
-  UNCHANGED
-}
+import { Container, Sprite, useScene } from 'phavuer'
+import { onMounted, onUnmounted, watch } from 'vue'
 
 const props = defineProps<{
   tilemap: Phaser.Tilemaps.Tilemap
   mapCharacter: MapCharacter
 }>()
 
-const charContainer = refObj<Phaser.GameObjects.Container>()
-const charSprite = refObj<Phaser.GameObjects.Sprite>()
-const charSpriteId = ref('')
-
 const gameStore = useGameStore()
 const mapStore = useMapStore()
 const scene = useScene()
 
-const currentPositionX = ref(0)
-const currentPositionY = ref(0)
-const isometricDepth = ref(1)
-const isInitialPosition = ref(true)
-const tween = ref<Phaser.Tweens.Tween | null>(null)
+const { characterContainer, characterSprite, currentPositionX, currentPositionY, isometricDepth, isFlippedX, updatePosition, calcDirection, updateSprite, initializeSprite, cleanup } = useCharacterSprite(scene, props.tilemap, props.mapCharacter)
 
-const updateIsometricDepth = (positionX: number, positionY: number) => {
-  isometricDepth.value = calculateIsometricDepth(positionX, positionY, 28, 94, true)
+const handlePositionUpdate = (newValues: any, oldValues: any) => {
+  if (!newValues) return
+
+  if (!oldValues || newValues.positionX !== oldValues.positionX || newValues.positionY !== oldValues.positionY) {
+    const direction = !oldValues ? Direction.POSITIVE : calcDirection(oldValues.positionX, oldValues.positionY, newValues.positionX, newValues.positionY)
+    updatePosition(newValues.positionX, newValues.positionY, direction)
   }
 
-const updatePosition = (positionX: number, positionY: number, direction: Direction) => {
-  const newPositionX = tileToWorldX(props.tilemap, positionX, positionY)
-  const newPositionY = tileToWorldY(props.tilemap, positionX, positionY)
-
-  if (isInitialPosition.value) {
-    currentPositionX.value = newPositionX
-    currentPositionY.value = newPositionY
-    isInitialPosition.value = false
-    return
-  }
-
-  if (tween.value?.isPlaying()) {
-    tween.value.stop()
-  }
-
-  const distance = Math.sqrt(Math.pow(newPositionX - currentPositionX.value, 2) + Math.pow(newPositionY - currentPositionY.value, 2))
-
-  if (distance >= config.tile_size.width / 1.1) {
-    currentPositionX.value = newPositionX
-    currentPositionY.value = newPositionY
-    return
-  }
-
-  const duration = distance * 5.7
-
-  tween.value = props.tilemap.scene.tweens.add({
-    targets: { x: currentPositionX.value, y: currentPositionY.value },
-    x: newPositionX,
-    y: newPositionY,
-    duration,
-    ease: 'Linear',
-    onStart: () => {
-      if (direction === Direction.POSITIVE) {
-        updateIsometricDepth(positionX, positionY)
-      }
-    },
-    onUpdate: (tween) => {
-      // @ts-ignore
-      currentPositionX.value = tween.targets[0].x
-      // @ts-ignore
-      currentPositionY.value = tween.targets[0].y
-    },
-    onComplete: () => {
-      if (direction === Direction.NEGATIVE) {
-        updateIsometricDepth(positionX, positionY)
-      }
-    }
-  })
-}
-
-const calcDirection = (oldPositionX: number, oldPositionY: number, newPositionX: number, newPositionY: number): Direction => {
-  if (newPositionY < oldPositionY || newPositionX < oldPositionX) return Direction.NEGATIVE
-  if (newPositionX > oldPositionX || newPositionY > oldPositionY) return Direction.POSITIVE
-  return Direction.UNCHANGED
-}
-
-const isFlippedX = computed(() => [6, 4].includes(props.mapCharacter.character.rotation ?? 0))
-
-const charTexture = computed(() => {
-  const spriteId = charSpriteId.value ?? 'idle_right_down'
-  const action = props.mapCharacter.isMoving ? 'walk' : 'idle'
-  const direction = [0, 6].includes(props.mapCharacter.character.rotation) ? 'left_up' : 'right_down'
-
-  return `${spriteId}-${action}_${direction}`
-})
-
-const updateSprite = () => {
-  if (props.mapCharacter.isMoving) {
-    charSprite.value!.anims.play(charTexture.value, true)
-  } else {
-    charSprite.value!.anims.stop()
-    charSprite.value!.setFrame(0)
-    charSprite.value!.setTexture(charTexture.value)
+  if (newValues.isMoving !== oldValues?.isMoving || newValues.rotation !== oldValues?.rotation) {
+    updateSprite()
   }
 }
 
@@ -134,51 +48,22 @@ watch(
     positionX: props.mapCharacter.character.positionX,
     positionY: props.mapCharacter.character.positionY,
     isMoving: props.mapCharacter.isMoving,
-    rotation: props.mapCharacter.character.rotation
+    rotation: props.mapCharacter.character.rotation,
+    isAttacking: props.mapCharacter.isAttacking
   }),
-  (newValues, oldValues) => {
-    if (!newValues) return
-
-    if (!oldValues || newValues.positionX !== oldValues.positionX || newValues.positionY !== oldValues.positionY) {
-      const direction = !oldValues ? Direction.POSITIVE : calcDirection(oldValues.positionX, oldValues.positionY, newValues.positionX, newValues.positionY)
-      updatePosition(newValues.positionX, newValues.positionY, direction)
-    }
-
-    // Handle animation updates
-    if (newValues.isMoving !== oldValues?.isMoving || newValues.rotation !== oldValues?.rotation) {
-      updateSprite()
-    }
-  }
+  handlePositionUpdate
 )
 
-const characterTypeStorage = new CharacterTypeStorage()
-characterTypeStorage.getSpriteId(props.mapCharacter.character.characterType!).then((spriteId) => {
-  console.log(spriteId)
-  charSpriteId.value = spriteId
-  loadSpriteTextures(scene, spriteId)
-    .then(() => {
-      charSprite.value!.setTexture(charTexture.value)
-      charSprite.value!.setFlipX(isFlippedX.value)
-    })
-    .catch((error) => {
-      console.error('Error loading texture:', error)
-    })
-})
-
-onMounted(() => {
-  charContainer.value!.setName(props.mapCharacter.character!.name)
+onMounted(async () => {
+  await initializeSprite()
 
   if (props.mapCharacter.character.id === gameStore.character!.id) {
     mapStore.setCharacterLoaded(true)
-
-    // #146 : Set camera position to character, need to be improved still
-    scene.cameras.main.startFollow(charContainer.value as Phaser.GameObjects.Container)
+    scene.cameras.main.startFollow(characterContainer.value as Phaser.GameObjects.Container)
   }
-
-  updatePosition(props.mapCharacter.character.positionX, props.mapCharacter.character.positionY, props.mapCharacter.character.rotation)
 })
 
 onUnmounted(() => {
-  tween.value?.stop()
+  cleanup()
 })
 </script>

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

@@ -1,51 +1,54 @@
 <template>
-  <Image v-bind="imageProps" v-if="gameStore.getLoadedAsset(texture)" />
+  <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 '@/composables/gameComposable'
+import { CharacterHairStorage, CharacterTypeStorage, SpriteStorage } from '@/storage/storages'
 import { useGameStore } from '@/stores/gameStore'
 import { Image, useScene } from 'phavuer'
-import { computed } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 
 const props = defineProps<{
   mapCharacter: MapCharacter
-  currentX: number
-  currentY: number
 }>()
 
 const gameStore = useGameStore()
 const scene = useScene()
+const hairSpriteId = ref('')
+const sprite = ref<SpriteT | null>(null)
 
 const texture = computed(() => {
-  const { rotation, characterHair } = props.mapCharacter.character
-  const spriteId = characterHair?.sprite?.id
+  const { rotation } = props.mapCharacter.character
   const direction = [0, 6].includes(rotation) ? 'back' : 'front'
 
-  return `${spriteId}-${direction}`
+  return `${hairSpriteId.value}-${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)
+  const spriteAction = sprite.value?.spriteActions?.find((spriteAction) => spriteAction.action === direction)
 
   return {
-    depth: 1,
+    depth: 9999,
     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
+    texture: texture.value
   }
 })
 
-loadSpriteTextures(scene, props.mapCharacter.character.characterHair?.sprite as SpriteT)
-  .then(() => {})
-  .catch((error) => {
-    console.error('Error loading texture:', error)
+onMounted(async () => {
+  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.get(spriteId)
+  await loadSpriteTextures(scene, spriteId)
 })
 </script>

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

@@ -1,5 +1,5 @@
 <template>
-  <Container ref="charChatContainer" :depth="999" :x="currentX" :y="currentY">
+  <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>
@@ -12,12 +12,10 @@ import { onMounted } from 'vue'
 
 const props = defineProps<{
   mapCharacter: MapCharacter
-  currentX: number
-  currentY: number
 }>()
 
 const game = useGame()
-const charChatContainer = refObj<Phaser.GameObjects.Container>()
+const characterChatContainer = refObj<Phaser.GameObjects.Container>()
 
 const createChatBubble = (container: Phaser.GameObjects.Container) => {
   container.setName(`${props.mapCharacter.character.name}_chatBubble`)
@@ -41,7 +39,7 @@ const createChatText = (text: Phaser.GameObjects.Text) => {
 }
 
 onMounted(() => {
-  charChatContainer.value!.setName(`${props.mapCharacter.character!.name}_chatContainer`)
-  charChatContainer.value!.setVisible(false)
+  characterChatContainer.value!.setName(`${props.mapCharacter.character!.name}_chatContainer`)
+  characterChatContainer.value!.setVisible(false)
 })
 </script>

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

@@ -1,5 +1,5 @@
 <template>
-  <Container :depth="999" :x="currentX" :y="currentY">
+  <Container :depth="999">
     <Text @create="createNicknameText" :text="props.mapCharacter.character.name" />
     <RoundRectangle :origin-x="0.5" :origin-y="18.5" :fillColor="0xffffff" :width="74" :height="6" :radius="5" />
     <RoundRectangle :origin-x="0.5" :origin-y="36.4" :fillColor="0x00b3b3" :width="70" :height="3" :radius="5" />
@@ -12,8 +12,6 @@ import { Container, RoundRectangle, Text, useGame } from 'phavuer'
 
 const props = defineProps<{
   mapCharacter: MapCharacter
-  currentX: number
-  currentY: number
 }>()
 
 const game = useGame()

src/components/game/gui/CharacterProfile.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="absolute" v-if="gameStore.uiSettings.isCharacterProfileOpen" :style="modalStyle">
     <div class="relative">
-      <img src="/assets/ui-elements/profile-ui-box-outer.svg" class="absolute w-full h-full" />
-      <img src="/assets/ui-elements/profile-ui-box-inner.svg" class="absolute left-2 bottom-2 w-[calc(100%_-_16px)] h-[calc(100%_-_40px)]" />
+      <img src="/assets/ui-elements/profile-ui-box-outer.svg" class="absolute w-full h-full" alt="" />
+      <img src="/assets/ui-elements/profile-ui-box-inner.svg" class="absolute left-2 bottom-2 w-[calc(100%_-_16px)] h-[calc(100%_-_40px)]" alt="" />
       <div @mousedown="startDrag" class="cursor-move px-5 py-2.5 flex justify-between items-center relative">
         <span class="text-xs text-white font-thin">Character Profile [Alt+C]</span>
         <button @click="gameStore.uiSettings.isCharacterProfileOpen = false" class="w-3.5 h-3.5 m-0 p-0 relative hover:rotate-180 transition-transform duration-300 ease-in-out">
-          <img alt="close" draggable="false" src="/assets/icons/modal/close-button-white.svg" class="w-full h-full" />
+          <img draggable="false" src="/assets/icons/modal/close-button-white.svg" class="w-full h-full" alt="Close button icon" />
         </button>
       </div>
       <div class="py-4 px-6 flex flex-col gap-7 relative z-10">
@@ -17,7 +17,7 @@
               <span class="text-xs">{{ gameStore.character?.experience }} / 18.600XP</span>
             </div>
             <a class="hover:cursor-pointer bg-[url('/assets/ui-elements/button-ui-box-textured-small.svg')] bg-no-repeat block w-8 h-8 relative mx-[3px]">
-              <img class="hover:drop-shadow-default w-3.5 h-3.5 m-[9px] object-contain" draggable="false" src="/assets/icons/plus-green-icon.svg" />
+              <img class="hover:drop-shadow-default w-3.5 h-3.5 m-[9px] object-contain" draggable="false" src="/assets/icons/plus-green-icon.svg" alt="Plus button icon" />
             </a>
           </div>
           <div class="flex justify-between">
@@ -37,20 +37,20 @@
                 </div>
               </div>
             </div>
-            <img src="/assets/placeholders/inventory_player.png" class="w-8 h-auto" />
+            <img src="/assets/placeholders/inventory_player.png" class="w-8 h-auto" alt="Player character sprite" />
             <div class="flex flex-col items-end gap-0.5">
               <div class="w-9 h-9 default-border rounded-sm bg-gray relative hover:bg-gray-600">
-                <img class="w-6 h-6 center-element" src="/assets/icons/profile/helmet.svg" />
+                <img class="w-6 h-6 center-element" src="/assets/icons/profile/helmet.svg" alt="Helmet icon" />
               </div>
               <div class="w-9 h-9 default-border rounded-sm bg-gray relative hover:bg-gray-600">
-                <img class="w-6 h-6 center-element" src="/assets/icons/profile/chestplate.svg" />
+                <img class="w-6 h-6 center-element" src="/assets/icons/profile/chestplate.svg" alt="Chestplate icon" />
               </div>
               <div class="flex gap-0.5 items-end">
                 <div class="w-6 h-6 default-border rounded-sm bg-gray relative hover:bg-gray-600">
-                  <img class="w-4 h-4 center-element" src="/assets/icons/profile/boots.svg" />
+                  <img class="w-4 h-4 center-element" src="/assets/icons/profile/boots.svg" alt="Boots icon" />
                 </div>
                 <div class="w-9 h-9 default-border rounded-sm bg-gray relative hover:bg-gray-600">
-                  <img class="w-6 h-6 center-element" src="/assets/icons/profile/legs.svg" />
+                  <img class="w-6 h-6 center-element" src="/assets/icons/profile/legs.svg" alt="Legs icon" />
                 </div>
               </div>
             </div>
@@ -119,111 +119,44 @@
 
 <script setup lang="ts">
 import { useGameStore } from '@/stores/gameStore'
-import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
+import { computed, onMounted, onUnmounted, ref } from 'vue'
 
 const gameStore = useGameStore()
 
-let startX = 0
-let startY = 0
-let initialX = 0
-let initialY = 0
-let modalPositionX = 0
-let modalPositionY = 0
-let modalWidth = 286
-let modalHeight = 483
-
-const width = ref(modalWidth)
-const height = ref(modalHeight)
-const x = ref(0)
-const y = ref(0)
+const width = ref(286)
+const height = ref(483)
+const x = ref(window.innerWidth / 2 - 143)
+const y = ref(window.innerHeight / 2 - 241)
 const isDragging = ref(false)
 
 const modalStyle = computed(() => ({
   top: `${y.value}px`,
   left: `${x.value}px`,
   width: `${width.value}px`,
-  height: `${height.value}px`,
-  maxWidth: '100vw',
-  maxHeight: '100vh'
+  height: `${height.value}px`
 }))
 
 function startDrag(event: MouseEvent) {
   isDragging.value = true
-  startX = event.clientX
-  startY = event.clientY
-  initialX = x.value
-  initialY = y.value
-  event.preventDefault()
-}
+  const startX = event.clientX - x.value
+  const startY = event.clientY - y.value
 
   function drag(event: MouseEvent) {
     if (!isDragging.value) return
-  const dx = event.clientX - startX
-  const dy = event.clientY - startY
-  x.value = initialX + dx
-  y.value = initialY + dy
-  adjustPosition()
+    x.value = event.clientX - startX
+    y.value = event.clientY - startY
   }
 
   function stopDrag() {
     isDragging.value = false
+    removeEventListener('mousemove', drag)
+    removeEventListener('mouseup', stopDrag)
   }
 
-function adjustPosition() {
-  x.value = Math.min(x.value, window.innerWidth - width.value)
-  y.value = Math.min(y.value, window.innerHeight - height.value)
+  addEventListener('mousemove', drag)
+  addEventListener('mouseup', stopDrag)
 }
 
-function initializePosition() {
-  width.value = Math.min(modalWidth, window.innerWidth)
-  height.value = Math.min(modalHeight, window.innerHeight)
-  if (modalPositionX !== 0 && modalPositionY !== 0) {
-    x.value = modalPositionX
-    y.value = modalPositionY
-  } else {
-    x.value = (window.innerWidth - width.value) / 2
-    y.value = (window.innerHeight - height.value) / 2
-  }
-}
-
-watch(
-  () => gameStore.uiSettings.isCharacterProfileOpen,
-  (value) => {
-    gameStore.uiSettings.isCharacterProfileOpen = value
-    if (value) {
-      initializePosition()
-    }
-  }
-)
-
-watch(
-  () => modalWidth,
-  (value) => {
-    width.value = Math.min(value, window.innerWidth)
-  }
-)
-
-watch(
-  () => modalHeight,
-  (value) => {
-    height.value = Math.min(value, window.innerHeight)
-  }
-)
-
-watch(
-  () => modalPositionX,
-  (value) => {
-    x.value = value
-  }
-)
-
-watch(
-  () => modalPositionY,
-  (value) => {
-    y.value = value
-  }
-)
-
 function keyPress(event: KeyboardEvent) {
   if (event.altKey && event.key === 'c') {
     gameStore.toggleCharacterProfile()
@@ -232,14 +165,9 @@ function keyPress(event: KeyboardEvent) {
 
 onMounted(() => {
   addEventListener('keydown', keyPress)
-  addEventListener('mousemove', drag)
-  addEventListener('mouseup', stopDrag)
-  initializePosition()
 })
 
 onUnmounted(() => {
   removeEventListener('keydown', keyPress)
-  removeEventListener('mousemove', drag)
-  removeEventListener('mouseup', stopDrag)
 })
 </script>

src/components/game/gui/Chat.vue

@@ -7,7 +7,7 @@
       </div>
     </div>
     <div class="w-96 mx-auto relative">
-      <img src="/assets/icons/ingameUI/chat-icon.svg" class="absolute top-1/2 -translate-y-1/2 left-2.5 h-4 w-4 opacity-50" />
+      <img src="/assets/icons/ingameUI/chat-icon.svg" class="absolute top-1/2 -translate-y-1/2 left-2.5 h-4 w-4 opacity-50" alt="" />
       <input
         class="w-[332px] h-8 rounded-sm text-xs font-default pl-8 pr-4 py-0 bg-gray-600 border-2 border-solid border-gray-500 text-gray-300 bg-[url('/assets/ui-texture.png')] bg-no-repeat bg-cover focus:outline-none focus:ring-0 focus:border-cyan-800"
         placeholder="Type something..."
@@ -85,11 +85,14 @@ gameStore.connection?.on('chat:message', (data: Chat) => {
 
   if (!mapStore.characterLoaded) return
 
-  const charChatContainer = scene.children.getByName(data.character.name + '_chatContainer') as Phaser.GameObjects.Container
-  if (!charChatContainer) return
+  const characterContainer = scene.children.getByName(data.character.name) as Phaser.GameObjects.Container
+  if (!characterContainer) return
 
-  const chatBubble = charChatContainer.getByName(data.character.name + '_chatBubble') as Phaser.GameObjects.Container
-  const chatText = charChatContainer.getByName(data.character.name + '_chatText') as Phaser.GameObjects.Text
+  const characterChatContainer = characterContainer.getByName(data.character.name + '_chatContainer') as Phaser.GameObjects.Container
+  if (!characterChatContainer) return
+
+  const chatBubble = characterChatContainer.getByName(data.character.name + '_chatBubble') as Phaser.GameObjects.Container
+  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 {
@@ -115,24 +118,24 @@ gameStore.connection?.on('chat:message', (data: Chat) => {
   // setText but with max. char limit of 90
   chatText.setText(data.message.substring(0, 90))
 
-  charChatContainer.setVisible(true)
+  characterChatContainer.setVisible(true)
 
   /**
    * Hide chat bubble after a few seconds
    */
 
   // Clear any existing hide timer
-  if (charChatContainer.getData('hideTimer')) {
-    clearTimeout(charChatContainer.getData('hideTimer'))
+  if (characterChatContainer.getData('hideTimer')) {
+    clearTimeout(characterChatContainer.getData('hideTimer'))
   }
 
   // Set a new hide timer
   const hideTimer = setTimeout(() => {
-    charChatContainer.setVisible(false)
+    characterChatContainer.setVisible(false)
   }, 3000)
 
   // Store the timer on the container itself
-  charChatContainer.setData('hideTimer', hideTimer)
+  characterChatContainer.setData('hideTimer', hideTimer)
 })
 scrollToBottom()
 

src/components/game/gui/Menu.vue

@@ -6,7 +6,7 @@
         <div class="group-hover:block absolute -left-2 bg-gray-500 h-3.5 w-2 [clip-path:polygon(100%_0,_0_50%,_100%_100%)] top-1/2 -translate-y-1/2 hidden"></div>
       </div>
       <a class="group-hover:cursor-pointer bg-[url('/assets/ui-elements/button-ui-box-textured.svg')] bg-no-repeat block w-[42px] h-[42px] relative">
-        <img class="group-hover:drop-shadow-default w-6 h-5 mx-[9px] my-[11px] object-contain" draggable="false" src="/assets/icons/ingameUI/menu-icon.svg" />
+        <img class="group-hover:drop-shadow-default w-6 h-5 mx-[9px] my-[11px] object-contain" draggable="false" src="/assets/icons/ingameUI/menu-icon.svg" alt="Menu button icon" />
       </a>
     </li>
     <li class="menu-item group relative" @click="gameStore.toggleCharacterProfile">
@@ -15,7 +15,7 @@
         <div class="group-hover:block absolute -left-2 bg-gray-500 h-3.5 w-2 [clip-path:polygon(100%_0,_0_50%,_100%_100%)] top-1/2 -translate-y-1/2 hidden"></div>
       </div>
       <a class="group-hover:cursor-pointer bg-[url('/assets/ui-elements/button-ui-box-textured.svg')] bg-no-repeat block w-[42px] h-[42px] relative">
-        <img class="group-hover:drop-shadow-default w-8 h-8 m-[5px] object-contain" draggable="false" src="/assets/placeholders/head.png" />
+        <img class="group-hover:drop-shadow-default w-8 h-8 m-[5px] object-contain" draggable="false" src="/assets/placeholders/head.png" alt="User profile button icon" />
         <p class="absolute bottom-0 -right-1.5 m-0 max-w-4 font-ui z-10 text-white text-[12px] leading-[6px] drop-shadow-pixel"><span class="font-ui text-white text-[8px] ml-0.5">LVL</span> {{ characterLevel }}</p>
       </a>
     </li>
@@ -25,7 +25,7 @@
         <div class="group-hover:block absolute -left-2 bg-gray-500 h-3.5 w-2 [clip-path:polygon(100%_0,_0_50%,_100%_100%)] top-1/2 -translate-y-1/2 hidden"></div>
       </div>
       <a class="group-hover:bg-gray-800 bg-gray-900 group-hover:cursor-pointer border-2 border-solid rounded border-gray-500 block w-[34px] h-[31px]">
-        <img class="group-hover:drop-shadow-default w-6 h-6 m-[5px] object-contain" draggable="false" src="/assets/icons/ingameUI/chat-icon.svg" />
+        <img class="group-hover:drop-shadow-default w-6 h-6 m-[5px] object-contain" draggable="false" src="/assets/icons/ingameUI/chat-icon.svg" alt="Open chat button icon" />
       </a>
     </li>
     <li class="menu-item group relative">
@@ -34,7 +34,7 @@
         <div class="group-hover:block absolute -left-2 bg-gray-500 h-3.5 w-2 [clip-path:polygon(100%_0,_0_50%,_100%_100%)] top-1/2 -translate-y-1/2 hidden"></div>
       </div>
       <a class="group-hover:bg-gray-800 bg-gray-900 group-hover:cursor-pointer border-2 border-solid rounded border-gray-500 block w-[34px] h-[31px]">
-        <img class="group-hover:drop-shadow-default w-6 h-6 m-[5px] object-contain" draggable="false" src="/assets/icons/ingameUI/map-icon.svg" />
+        <img class="group-hover:drop-shadow-default w-6 h-6 m-[5px] object-contain" draggable="false" src="/assets/icons/ingameUI/map-icon.svg" alt="World map button icon" />
       </a>
     </li>
     <li class="menu-item group relative">
@@ -43,7 +43,7 @@
         <div class="group-hover:block absolute -left-2 bg-gray-500 h-3.5 w-2 [clip-path:polygon(100%_0,_0_50%,_100%_100%)] top-1/2 -translate-y-1/2 hidden"></div>
       </div>
       <a class="group-hover:bg-gray-800 bg-gray-900 group-hover:cursor-pointer border-2 border-solid rounded border-gray-500 block w-[34px] h-[31px]">
-        <img class="group-hover:drop-shadow-default w-6 h-6 m-[5px] object-contain" draggable="false" src="/assets/icons/ingameUI/socials-icon.svg" />
+        <img class="group-hover:drop-shadow-default w-6 h-6 m-[5px] object-contain" draggable="false" src="/assets/icons/ingameUI/socials-icon.svg" alt="Users button icon" />
       </a>
     </li>
   </ul>

src/components/game/gui/Minimap.vue

@@ -5,12 +5,12 @@
     </div>
     <div class="absolute -bottom-3 left-1/2 -translate-x-1/2 flex gap-1">
       <button class="w-6 h-6 relative p-0">
-        <img class="w-3 h-3 center-element" src="/assets/icons/plus-icon.svg" />
-        <img class="w-full h-full" src="/assets/ui-elements/button-ui-box-textured.svg" />
+        <img class="w-3 h-3 center-element" src="/assets/icons/plus-icon.svg" alt="Zoom-in button icon" />
+        <img class="w-full h-full" src="/assets/ui-elements/button-ui-box-textured.svg" alt="" />
       </button>
       <button class="w-6 h-6 relative p-0">
-        <img class="w-3 h-3 center-element" src="/assets/icons/minus-icon.svg" />
-        <img class="w-full h-full" src="/assets/ui-elements/button-ui-box-textured.svg" />
+        <img class="w-3 h-3 center-element" src="/assets/icons/minus-icon.svg" alt="Zoom-out button icon" />
+        <img class="w-full h-full" src="/assets/ui-elements/button-ui-box-textured.svg" alt="" />
       </button>
     </div>
   </div>

src/components/game/map/Map.vue

@@ -1,14 +1,14 @@
 <template>
   <MapTiles :key="mapStore.mapId" @tileMap:create="tileMap = $event" />
-  <!--  <MapObjects v-if="tileMap" :tilemap="tileMap as Phaser.Tilemaps.Tilemap" />-->
-  <Characters v-if="tileMap" :tilemap="tileMap as Phaser.Tilemaps.Tilemap" />
+  <PlacedMapObjects v-if="tileMap" :key="mapStore.mapId" :tilemap="tileMap" />
+  <Characters v-if="tileMap && mapStore.characters" :tilemap="tileMap" />
 </template>
 
 <script setup lang="ts">
 import type { MapCharacter, mapLoadData, UUID } from '@/application/types'
 import Characters from '@/components/game/map/Characters.vue'
 import MapTiles from '@/components/game/map/MapTiles.vue'
-import MapObjects from '@/components/game/map/PlacedMapObjects.vue'
+import PlacedMapObjects from '@/components/game/map/PlacedMapObjects.vue'
 import { useGameStore } from '@/stores/gameStore'
 import { useMapStore } from '@/stores/mapStore'
 import { onUnmounted, shallowRef } from 'vue'
@@ -18,14 +18,6 @@ const mapStore = useMapStore()
 
 const tileMap = shallowRef<Phaser.Tilemaps.Tilemap>()
 
-onUnmounted(() => {
-  mapStore.reset()
-  gameStore.connection?.off('map:character:teleport')
-  gameStore.connection?.off('map:character:join')
-  gameStore.connection?.off('map:character:leave')
-  gameStore.connection?.off('map:character:move')
-})
-
 // Event listeners
 gameStore.connection?.on('map:character:teleport', async (data: mapLoadData) => {
   mapStore.setMapId(data.mapId)
@@ -40,7 +32,25 @@ gameStore.connection?.on('map:character:leave', (characterId: UUID) => {
   mapStore.removeCharacter(characterId)
 })
 
+gameStore.connection?.on('map:character:attack', (characterId: UUID) => {
+  mapStore.updateCharacterProperty(characterId, 'isAttacking', true)
+})
+
 gameStore.connection?.on('map:character:move', (data: { characterId: UUID; positionX: number; positionY: number; rotation: number; isMoving: boolean }) => {
   mapStore.updateCharacterPosition(data)
+  // @TODO: Replace with universal class, composable or store
+  if (data.characterId === gameStore.character?.id) {
+    gameStore.character!.positionX = data.positionX
+    gameStore.character!.positionY = data.positionY
+    gameStore.character!.rotation = data.rotation
+  }
+})
+
+onUnmounted(() => {
+  mapStore.reset()
+  gameStore.connection?.off('map:character:teleport')
+  gameStore.connection?.off('map:character:join')
+  gameStore.connection?.off('map:character:leave')
+  gameStore.connection?.off('map:character:move')
 })
 </script>

src/components/game/map/MapTiles.vue

@@ -4,14 +4,14 @@
 
 <script setup lang="ts">
 import config from '@/application/config'
-import type { UUID } from '@/application/types'
+import type { Map as MapT, UUID } from '@/application/types'
 import { unduplicateArray } from '@/application/utilities'
 import Controls from '@/components/utilities/Controls.vue'
-import { FlattenMapArray, loadMapTilesIntoScene, setLayerTiles } from '@/composables/mapComposable'
+import { loadMapTilesIntoScene, setLayerTiles } from '@/composables/mapComposable'
 import { MapStorage } from '@/storage/storages'
 import { useMapStore } from '@/stores/mapStore'
 import { useScene } from 'phavuer'
-import { onBeforeUnmount, onMounted, shallowRef } from 'vue'
+import { onBeforeUnmount, shallowRef } from 'vue'
 
 import Tileset = Phaser.Tilemaps.Tileset
 
@@ -23,10 +23,10 @@ const mapStorage = new MapStorage()
 const tileMap = shallowRef<Phaser.Tilemaps.Tilemap>()
 const tileLayer = shallowRef<Phaser.Tilemaps.TilemapLayer>()
 
-function createTileMap(mapData: any) {
+function createTileMap(map: MapT) {
   const mapConfig = new Phaser.Tilemaps.MapData({
-    width: mapData?.width,
-    height: mapData?.height,
+    width: map.width,
+    height: map.height,
     tileWidth: config.tile_size.width,
     tileHeight: config.tile_size.height,
     orientation: Phaser.Tilemaps.Orientation.ISOMETRIC,
@@ -39,9 +39,9 @@ function createTileMap(mapData: any) {
 }
 
 function createTileLayer(currentTileMap: Phaser.Tilemaps.Tilemap, mapData: any) {
-  const tilesArray = unduplicateArray(FlattenMapArray(mapData?.tiles ?? []))
+  const tilesArray = unduplicateArray(mapData?.tiles.flat())
 
-  const tilesetImages = tilesArray.map((tile: any, index: number) => {
+  const tilesetImages = tilesArray.map((tile: string, index: number) => {
     return currentTileMap.addTilesetImage(tile, tile, config.tile_size.width, config.tile_size.height, 1, 2, index + 1, { x: 0, y: -config.tile_size.height })
   })
 
@@ -55,16 +55,15 @@ function createTileLayer(currentTileMap: Phaser.Tilemaps.Tilemap, mapData: any)
   return layer
 }
 
-onMounted(() => {
 loadMapTilesIntoScene(mapStore.mapId as UUID, scene)
   .then(() => mapStorage.get(mapStore.mapId))
   .then((mapData) => {
+    if (!mapData || !mapData?.tiles) return
     tileMap.value = createTileMap(mapData)
     tileLayer.value = createTileLayer(tileMap.value, mapData)
-      setLayerTiles(tileMap.value, tileLayer.value, mapData?.tiles)
+    setLayerTiles(tileMap.value, tileLayer.value, mapData.tiles)
   })
   .catch((error) => console.error('Failed to initialize map:', error))
-})
 
 onBeforeUnmount(() => {
   if (!tileMap.value) return

src/components/game/map/PlacedMapObjects.vue

@@ -1,14 +1,28 @@
 <template>
-  <PlacedMapObject v-for="placedMapObject in mapStore.map?.placedMapObjects" :tilemap="tilemap" :placedMapObject />
+  <PlacedMapObject v-for="placedMapObject in items" :tilemap="tilemap" :placedMapObject />
 </template>
 
 <script setup lang="ts">
+import type { PlacedMapObject as PlacedMapObjectT } from '@/application/types'
 import PlacedMapObject from '@/components/game/map/partials/PlacedMapObject.vue'
+import { MapStorage } from '@/storage/storages'
 import { useMapStore } from '@/stores/mapStore'
-
-const mapStore = useMapStore()
+import { onMounted, ref } from 'vue'
 
 defineProps<{
   tilemap: Phaser.Tilemaps.Tilemap
 }>()
+
+const mapStore = useMapStore()
+const mapStorage = new MapStorage()
+const items = ref<PlacedMapObjectT[]>([])
+
+onMounted(async () => {
+  if (!mapStore.mapId) return
+
+  const map = await mapStorage.get(mapStore.mapId)
+  if (!map) return
+
+  items.value = map.placedMapObjects
+})
 </script>

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

@@ -1,5 +1,5 @@
 <template>
-  <Image v-if="gameStore.isAssetLoaded(props.placedMapObject.mapObject)" v-bind="imageProps" />
+  <Image v-if="gameStore.isTextureLoaded(props.placedMapObject.mapObject.id)" v-bind="imageProps" />
 </template>
 
 <script setup lang="ts">
@@ -8,7 +8,7 @@ import { loadTexture } from '@/composables/gameComposable'
 import { calculateIsometricDepth, tileToWorldX, tileToWorldY } from '@/composables/mapComposable'
 import { useGameStore } from '@/stores/gameStore'
 import { Image, useScene } from 'phavuer'
-import { computed } from 'vue'
+import { computed, onMounted } from 'vue'
 
 const props = defineProps<{
   tilemap: Phaser.Tilemaps.Tilemap
@@ -38,4 +38,6 @@ loadTexture(scene, {
 } as TextureData).catch((error) => {
   console.error('Error loading texture:', error)
 })
+
+onMounted(async () => {})
 </script>

src/components/gameMaster/GmPanel.vue

@@ -6,7 +6,7 @@
         <button @mousedown.stop class="btn-cyan py-1.5 px-4 min-w-24">Users</button>
         <button @mousedown.stop class="btn-cyan py-1.5 px-4 min-w-24">Chats</button>
         <button @mousedown.stop class="btn-cyan active py-1.5 px-4 min-w-24">Asset manager</button>
-        <button class="btn-cyan py-1.5 px-4 min-w-24" type="button" @click="() => mapEditorStore.toggleActive()">Map editor</button>
+        <button class="btn-cyan py-1.5 px-4 min-w-24" type="button" @click="$emit('open-map-editor')">Map editor</button>
       </div>
     </template>
     <template #modalBody>
@@ -20,12 +20,13 @@
 <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 { useMapEditorStore } from '@/stores/mapEditorStore'
 import { ref } from 'vue'
 
+defineEmits(['open-map-editor'])
 const gameStore = useGameStore()
-const mapEditorStore = useMapEditorStore()
+const mapEditor = useMapEditorComposable()
 
 let toggle = ref('asset-manager')
 </script>

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

@@ -9,7 +9,7 @@
       </button>
     </label>
   </div>
-  <div v-bind="containerProps" class="overflow-y-auto relative p-2.5 rounded-md default-border bg-gray" @scroll="onScroll">
+  <div v-bind="containerProps" class="flex-1 overflow-y-auto relative p-2.5 rounded-md default-border bg-gray" @scroll="onScroll">
     <div v-bind="wrapperProps" ref="elementToScroll" class="flex flex-col gap-2.5">
       <a
         v-for="{ data: characterHair } in list"
@@ -93,7 +93,6 @@ function toTop() {
 
 onMounted(() => {
   gameStore.connection?.emit('gm:characterHair:list', {}, (response: CharacterHair[]) => {
-    console.log(response)
     assetManagerStore.setCharacterHairList(response)
   })
 })

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

@@ -9,7 +9,7 @@
       </button>
     </label>
   </div>
-  <div v-bind="containerProps" class="overflow-y-auto relative p-2.5 rounded-md default-border bg-gray" @scroll="onScroll">
+  <div v-bind="containerProps" class="flex-1 overflow-y-auto relative p-2.5 rounded-md default-border bg-gray" @scroll="onScroll">
     <div v-bind="wrapperProps" ref="elementToScroll" class="flex flex-col gap-2.5">
       <a
         v-for="{ data: characterType } in list"
@@ -93,7 +93,6 @@ function toTop() {
 
 onMounted(() => {
   gameStore.connection?.emit('gm:characterType:list', {}, (response: CharacterType[]) => {
-    console.log(response)
     assetManagerStore.setCharacterTypeList(response)
   })
 })

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

@@ -9,7 +9,7 @@
       </button>
     </label>
   </div>
-  <div v-bind="containerProps" class="overflow-y-auto relative p-2.5 rounded-md default-border bg-gray" @scroll="onScroll">
+  <div v-bind="containerProps" class="flex-1 overflow-y-auto relative p-2.5 rounded-md default-border bg-gray" @scroll="onScroll">
     <div v-bind="wrapperProps" ref="elementToScroll" class="flex flex-col gap-2.5">
       <a v-for="{ data: item } in list" :key="item.id" class="relative p-2.5 cursor-pointer block rounded hover:bg-cyan group" :class="{ 'bg-cyan': assetManagerStore.selectedItem?.id === item.id }" @click="assetManagerStore.setSelectedItem(item as Item)">
         <div class="flex items-center gap-2.5">

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

@@ -21,13 +21,6 @@
           <label for="tags">Tags</label>
           <ChipsInput v-model="mapObjectTags" @update:modelValue="mapObjectTags = $event" />
         </div>
-        <div class="form-field-full">
-          <label for="is-animated">Is animated</label>
-          <select v-model="mapObjectIsAnimated" class="input-field" name="is-animated">
-            <option :value="false">No</option>
-            <option :value="true">Yes</option>
-          </select>
-        </div>
         <div class="form-field-full">
           <label for="frame-speed">Frame rate</label>
           <input v-model="mapObjectFrameRate" class="input-field" type="number" step="any" name="frame-speed" placeholder="Frame rate" />
@@ -55,12 +48,10 @@ import type { MapObject } from '@/application/types'
 import ChipsInput from '@/components/forms/ChipsInput.vue'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useGameStore } from '@/stores/gameStore'
-import { useMapEditorStore } from '@/stores/mapEditorStore'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
 const gameStore = useGameStore()
 const assetManagerStore = useAssetManagerStore()
-const mapEditorStore = useMapEditorStore()
 
 const selectedMapObject = computed(() => assetManagerStore.selectedMapObject)
 
@@ -68,7 +59,6 @@ const mapObjectName = ref('')
 const mapObjectTags = ref<string[]>([])
 const mapObjectOriginX = ref(0)
 const mapObjectOriginY = ref(0)
-const mapObjectIsAnimated = ref(false)
 const mapObjectFrameRate = ref(0)
 const mapObjectFrameWidth = ref(0)
 const mapObjectFrameHeight = ref(0)
@@ -82,7 +72,6 @@ if (selectedMapObject.value) {
   mapObjectTags.value = selectedMapObject.value.tags
   mapObjectOriginX.value = selectedMapObject.value.originX
   mapObjectOriginY.value = selectedMapObject.value.originY
-  mapObjectIsAnimated.value = selectedMapObject.value.isAnimated
   mapObjectFrameRate.value = selectedMapObject.value.frameRate
   mapObjectFrameWidth.value = selectedMapObject.value.frameWidth
   mapObjectFrameHeight.value = selectedMapObject.value.frameHeight
@@ -105,10 +94,6 @@ function refreshObjectList(unsetSelectedMapObject = true) {
     if (unsetSelectedMapObject) {
       assetManagerStore.setSelectedMapObject(null)
     }
-
-    if (mapEditorStore.active) {
-      mapEditorStore.setMapObjectList(response)
-    }
   })
 }
 
@@ -126,7 +111,6 @@ function saveObject() {
       tags: mapObjectTags.value,
       originX: mapObjectOriginX.value,
       originY: mapObjectOriginY.value,
-      isAnimated: mapObjectIsAnimated.value,
       frameRate: mapObjectFrameRate.value,
       frameWidth: mapObjectFrameWidth.value,
       frameHeight: mapObjectFrameHeight.value
@@ -147,7 +131,6 @@ watch(selectedMapObject, (mapObject: MapObject | null) => {
   mapObjectTags.value = mapObject.tags
   mapObjectOriginX.value = mapObject.originX
   mapObjectOriginY.value = mapObject.originY
-  mapObjectIsAnimated.value = mapObject.isAnimated
   mapObjectFrameRate.value = mapObject.frameRate
   mapObjectFrameWidth.value = mapObject.frameWidth
   mapObjectFrameHeight.value = mapObject.frameHeight

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

@@ -8,7 +8,7 @@
       </svg>
     </label>
   </div>
-  <div v-bind="containerProps" class="overflow-y-auto relative p-2.5 rounded-md default-border bg-gray" @scroll="onScroll">
+  <div v-bind="containerProps" class="flex-1 overflow-y-auto relative p-2.5 rounded-md default-border bg-gray" @scroll="onScroll">
     <div v-bind="wrapperProps" ref="elementToScroll" class="flex flex-col gap-2.5">
       <a v-for="{ data: mapObject } in list" :key="mapObject.id" class="relative p-2.5 cursor-pointer block rounded hover:bg-cyan group" :class="{ 'bg-cyan': assetManagerStore.selectedMapObject?.id === mapObject.id }" @click="assetManagerStore.setSelectedMapObject(mapObject as MapObject)">
         <div class="flex items-center gap-2.5">

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

@@ -21,9 +21,12 @@
       <button class="btn-cyan py-2 my-4" type="button" @click.prevent="addNewImage">New action</button>
       <Accordion v-for="action in spriteActions" :key="action.id">
         <template #header>
-          <div class="flex justify-between items-center">
+          <div class="flex items-center">
             {{ action.action }}
-            <button class="btn-red px-4 py-1.5 min-w-24" type="button" @click.prevent="() => spriteActions.splice(spriteActions.indexOf(action), 1)">Delete</button>
+            <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>
         </template>
         <template #content>
@@ -40,38 +43,35 @@
               <label for="origin-y">Origin Y</label>
               <input v-model.number="action.originY" class="input-field" type="number" step="any" name="origin-y" placeholder="Origin Y" />
             </div>
-            <div class="form-field-half">
-              <label for="is-animated">Is animated</label>
-              <select v-model="action.isAnimated" class="input-field" name="is-animated">
-                <option :value="false">No</option>
-                <option :value="true">Yes</option>
-              </select>
-            </div>
-            <div class="form-field-half" v-if="action.isAnimated">
-              <label for="is-looping">Is looping</label>
-              <select v-model="action.isLooping" class="input-field" name="is-looping">
-                <option :value="false">No</option>
-                <option :value="true">Yes</option>
-              </select>
-            </div>
-            <div class="form-field-full" v-if="action.isAnimated">
+            <div class="form-field-full">
               <label for="frame-speed">Frame rate</label>
               <input v-model.number="action.frameRate" class="input-field" type="number" step="any" name="frame-speed" placeholder="Frame rate" />
             </div>
             <div class="form-field-full">
-              <SpriteActionsInput v-model="action.sprites" />
+              <SpriteActionsInput v-model="action.sprites" @tempOffsetChange="(index, offset) => handleTempOffsetChange(action, index, offset)" />
             </div>
           </form>
         </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 type { Sprite, SpriteAction } from '@/application/types'
+import type { Sprite, SpriteAction, UUID } from '@/application/types'
 import { uuidv4 } from '@/application/utilities'
 import SpriteActionsInput from '@/components/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue'
+import SpritePreview from '@/components/gameMaster/assetManager/partials/sprite/partials/SpritePreview.vue'
 import Accordion from '@/components/utilities/Accordion.vue'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useGameStore } from '@/stores/gameStore'
@@ -84,6 +84,8 @@ const selectedSprite = computed(() => assetManagerStore.selectedSprite)
 
 const spriteName = ref('')
 const spriteActions = ref<SpriteAction[]>([])
+const isModalOpen = ref(false)
+const selectedAction = ref<SpriteAction | null>(null)
 
 if (!selectedSprite.value) {
   console.error('No sprite selected')
@@ -140,8 +142,6 @@ function saveSprite() {
           sprites: action.sprites,
           originX: action.originX,
           originY: action.originY,
-          isAnimated: action.isAnimated,
-          isLooping: action.isLooping,
           frameRate: action.frameRate,
           frameWidth: action.frameWidth,
           frameHeight: action.frameHeight
@@ -163,14 +163,11 @@ function addNewImage() {
 
   const newImage: SpriteAction = {
     id: uuidv4(),
-    spriteId: selectedSprite.value.id,
-    sprite: selectedSprite.value,
+    sprite: selectedSprite.value.id,
     action: 'new_action',
     sprites: [],
     originX: 0,
     originY: 0,
-    isAnimated: false,
-    isLooping: false,
     frameRate: 0,
     frameWidth: 0,
     frameHeight: 0
@@ -188,12 +185,40 @@ function sortSpriteActions(actions: SpriteAction[]): SpriteAction[] {
   return [...actions].sort((a, b) => a.action.localeCompare(b.action))
 }
 
+function openPreviewModal(action: SpriteAction) {
+  selectedAction.value = action
+  isModalOpen.value = true
+}
+
+function updateFrameRate(value: number) {
+  if (selectedAction.value) {
+    selectedAction.value.frameRate = value
+  }
+}
+
+const tempOffsetData = ref<{ index: number | undefined; offset: { x: number; y: number } | undefined }>({
+  index: undefined,
+  offset: undefined
+})
+
+function handleTempOffsetChange(action: SpriteAction, index: number, offset: { x: number; y: number }) {
+  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)
 })
 
+watch(isModalOpen, (newValue) => {
+  if (!newValue) {
+    selectedAction.value = null
+  }
+})
+
 onMounted(() => {
   if (!selectedSprite.value) return
 })

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

@@ -7,7 +7,7 @@
       </svg>
     </button>
   </div>
-  <div v-bind="containerProps" class="overflow-y-auto relative p-2.5 rounded-md default-border bg-gray" @scroll="onScroll">
+  <div v-bind="containerProps" class="flex-1 overflow-y-auto relative p-2.5 rounded-md default-border bg-gray" @scroll="onScroll">
     <div v-bind="wrapperProps" ref="elementToScroll" class="flex flex-col gap-2.5">
       <a v-for="{ data: sprite } in list" :key="sprite.id" class="relative p-2.5 cursor-pointer block rounded hover:bg-cyan group" :class="{ 'bg-cyan': assetManagerStore.selectedSprite?.id === sprite.id }" @click="assetManagerStore.setSelectedSprite(sprite as Sprite)">
         <div class="flex items-center gap-2.5">

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

@@ -1,19 +1,44 @@
 <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" class="max-w-full max-h-full object-contain pointer-events-none" alt="Uploaded image" />
+      <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">{{ image.dimensions.width }}x{{ image.dimensions.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 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 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="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
+        <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">
@@ -25,10 +50,19 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import Modal from '@/components/utilities/Modal.vue'
+import { ref, watch } from 'vue'
+
+interface SpriteImage {
+  url: string
+  offset: {
+    x: number
+    y: number
+  }
+}
 
 interface Props {
-  modelValue: string[]
+  modelValue: SpriteImage[]
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -36,11 +70,15 @@ const props = withDefaults(defineProps<Props>(), {
 })
 
 const emit = defineEmits<{
-  (e: 'update:modelValue', value: string[]): void
+  (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()
@@ -61,19 +99,25 @@ const onDrop = (event: DragEvent) => {
 
 const handleFiles = (files: FileList) => {
   Array.from(files).forEach((file) => {
-    if (file.type.startsWith('image/')) {
+    if (!file.type.startsWith('image/')) {
+      return
+    }
+
     const reader = new FileReader()
     reader.onload = (e) => {
       if (typeof e.target?.result === 'string') {
-          updateImages([...props.modelValue, e.target.result])
+        const newImage: SpriteImage = {
+          url: e.target.result,
+          offset: { x: 0, y: 0 }
+        }
+        updateImages([...props.modelValue, newImage])
       }
     }
     reader.readAsDataURL(file)
-    }
   })
 }
 
-const updateImages = (newImages: string[]) => {
+const updateImages = (newImages: SpriteImage[]) => {
   emit('update:modelValue', newImages)
 }
 
@@ -101,4 +145,41 @@ const drop = (event: DragEvent, dropIndex: number) => {
   }
   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

@@ -26,14 +26,14 @@
 import config from '@/application/config'
 import type { Tile } from '@/application/types'
 import ChipsInput from '@/components/forms/ChipsInput.vue'
+import { TileStorage } from '@/storage/storages'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useGameStore } from '@/stores/gameStore'
-import { useMapEditorStore } from '@/stores/mapEditorStore'
 import { computed, onBeforeUnmount, onMounted, ref, toRaw, watch } from 'vue'
 
 const gameStore = useGameStore()
 const assetManagerStore = useAssetManagerStore()
-const mapEditorStore = useMapEditorStore()
+const tileStorage = new TileStorage()
 
 const selectedTile = computed(() => assetManagerStore.selectedTile)
 
@@ -55,12 +55,13 @@ watch(selectedTile, (tile: Tile | null) => {
   tileTags.value = tile.tags
 })
 
-function deleteTile() {
-  gameStore.connection?.emit('gm:tile:delete', { id: selectedTile.value?.id }, (response: boolean) => {
+async function deleteTile() {
+  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)
     refreshTileList()
   })
 }
@@ -72,10 +73,6 @@ function refreshTileList(unsetSelectedTile = true) {
     if (unsetSelectedTile) {
       assetManagerStore.setSelectedTile(null)
     }
-
-    if (mapEditorStore.active) {
-      mapEditorStore.setTileList(response)
-    }
   })
 }
 

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

@@ -8,7 +8,7 @@
       </svg>
     </label>
   </div>
-  <div v-bind="containerProps" class="overflow-y-auto relative p-2.5 rounded-md default-border bg-gray" @scroll="onScroll">
+  <div v-bind="containerProps" class="flex-1 overflow-y-auto relative p-2.5 rounded-md default-border bg-gray" @scroll="onScroll">
     <div v-bind="wrapperProps" ref="elementToScroll" class="flex flex-col gap-2.5">
       <a v-for="{ data: tile } in list" :key="tile.id" class="relative p-2.5 cursor-pointer block rounded hover:bg-cyan group" :class="{ 'bg-cyan': assetManagerStore.selectedTile?.id === tile.id }" @click="assetManagerStore.setSelectedTile(tile)">
         <div class="flex items-center gap-2.5">

src/components/gameMaster/mapEditor/Map.vue

@@ -0,0 +1,46 @@
+<template>
+  <MapTiles ref="mapTiles" @tileMap:create="tileMap = $event" />
+  <PlacedMapObjects ref="mapObjects" v-if="tileMap" :tileMap="tileMap as Phaser.Tilemaps.Tilemap" />
+  <MapEventTiles ref="eventTiles" v-if="tileMap" :tileMap="tileMap as Phaser.Tilemaps.Tilemap" />
+</template>
+
+<script setup lang="ts">
+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 { useScene } from 'phavuer'
+import { onMounted, onUnmounted, shallowRef, useTemplateRef } from 'vue'
+
+const tileMap = shallowRef<Phaser.Tilemaps.Tilemap>()
+const mapEditor = useMapEditorComposable()
+
+const scene = useScene()
+
+const mapTiles = useTemplateRef('mapTiles')
+const mapObjects = useTemplateRef('mapObjects')
+const eventTiles = useTemplateRef('eventTiles')
+
+function handlePointer(pointer: Phaser.Input.Pointer) {
+  if (!mapTiles.value || !mapObjects.value || !eventTiles.value) return
+
+  // Check if left mouse button is pressed
+  if (!pointer.isDown) return
+
+  // Check if shift is pressed or if we're in move mode, this means we are moving the camera
+  if (pointer.event.shiftKey || mapEditor.tool.value === 'move') return
+
+  // Check if draw mode is tile
+  switch (mapEditor.drawMode.value) {
+    case 'tile':
+      mapTiles.value.handlePointer(pointer)
+      break
+    case 'object':
+      mapObjects.value.handlePointer(pointer)
+      break
+    case 'event':
+      eventTiles.value.handlePointer(pointer)
+      break
+  }
+}
+</script>

src/components/gameMaster/mapEditor/MapEditor.vue

@@ -1,75 +0,0 @@
-<template>
-  <MapTiles @tileMap:create="tileMap = $event" />
-  <MapObjects v-if="tileMap" :tilemap="tileMap as Phaser.Tilemaps.Tilemap" />
-  <MapEventTiles v-if="tileMap" :tilemap="tileMap as Phaser.Tilemaps.Tilemap" />
-
-  <Toolbar @save="save" @clear="clear" />
-
-  <MapList />
-  <TileList />
-  <ObjectList />
-
-  <MapSettings />
-  <TeleportModal />
-</template>
-
-<script setup lang="ts">
-import { type Map } from '@/application/types'
-import MapEventTiles from '@/components/gameMaster/mapEditor/mapPartials/MapEventTiles.vue'
-import MapTiles from '@/components/gameMaster/mapEditor/mapPartials/MapTiles.vue'
-import MapObjects from '@/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue'
-import MapList from '@/components/gameMaster/mapEditor/partials/MapList.vue'
-import ObjectList from '@/components/gameMaster/mapEditor/partials/MapObjectList.vue'
-import MapSettings from '@/components/gameMaster/mapEditor/partials/MapSettings.vue'
-import TeleportModal from '@/components/gameMaster/mapEditor/partials/TeleportModal.vue'
-import TileList from '@/components/gameMaster/mapEditor/partials/TileList.vue'
-// Components
-import Toolbar from '@/components/gameMaster/mapEditor/partials/Toolbar.vue'
-import { useGameStore } from '@/stores/gameStore'
-import { useMapEditorStore } from '@/stores/mapEditorStore'
-import { onUnmounted, ref, shallowRef } from 'vue'
-
-const gameStore = useGameStore()
-const mapEditorStore = useMapEditorStore()
-
-const tileMap = shallowRef<Phaser.Tilemaps.Tilemap>()
-
-function clear() {
-  if (!mapEditorStore.map) return
-
-  // Clear objects, event tiles and tiles
-  mapEditorStore.map.placedMapObjects = []
-  mapEditorStore.map.mapEventTiles = []
-  mapEditorStore.triggerClearTiles()
-}
-
-function save() {
-  if (!mapEditorStore.map) return
-
-  const data = {
-    mapId: mapEditorStore.map.id,
-    name: mapEditorStore.mapSettings.name,
-    width: mapEditorStore.mapSettings.width,
-    height: mapEditorStore.mapSettings.height,
-    tiles: mapEditorStore.map.tiles,
-    pvp: mapEditorStore.map.pvp,
-    mapEffects: mapEditorStore.map.mapEffects?.map(({ id, effect, strength }) => ({ id, effect, strength })) ?? [],
-    mapEventTiles: mapEditorStore.map.mapEventTiles?.map(({ id, type, positionX, positionY, teleport }) => ({ id, type, positionX, positionY, teleport })) ?? [],
-    placedMapObjects: mapEditorStore.map.placedMapObjects?.map(({ id, mapObject, depth, isRotated, positionX, positionY }) => ({ id, mapObject, depth, isRotated, positionX, positionY })) ?? []
-  }
-
-  console.log(data.mapEventTiles)
-
-  if (mapEditorStore.isSettingsModalShown) {
-    mapEditorStore.toggleSettingsModal()
-  }
-
-  gameStore.connection?.emit('gm:map:update', data, (response: Map) => {
-    mapEditorStore.setMap(response)
-  })
-}
-
-onUnmounted(() => {
-  mapEditorStore.reset()
-})
-</script>

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

@@ -1,88 +1,86 @@
 <template>
-  <Image v-for="tile in mapEditorStore.map?.mapEventTiles" v-bind="getImageProps(tile)" />
+  <Image v-for="tile in mapEditor.currentMap.value?.mapEventTiles" v-bind="getImageProps(tile)" />
 </template>
 
 <script setup lang="ts">
-import { MapEventTileType, type MapEventTile } from '@/application/types'
+import { MapEventTileType, type MapEventTile, type Map as MapT } from '@/application/types'
 import { uuidv4 } from '@/application/utilities'
 import { getTile, tileToWorldX, tileToWorldY } from '@/composables/mapComposable'
-import { useMapEditorStore } from '@/stores/mapEditorStore'
+import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
 import { Image, useScene } from 'phavuer'
-import { onMounted, onUnmounted } from 'vue'
+import { shallowRef } from 'vue'
 
-const scene = useScene()
-const mapEditorStore = useMapEditorStore()
+const mapEditor = useMapEditorComposable()
+
+defineExpose({ handlePointer })
 
 const props = defineProps<{
-  tilemap: Phaser.Tilemaps.Tilemap
+  tileMap: Phaser.Tilemaps.Tilemap
 }>()
 
+const tileLayer = shallowRef<Phaser.Tilemaps.TilemapLayer>()
+
 function getImageProps(tile: MapEventTile) {
   return {
-    x: tileToWorldX(props.tilemap, tile.positionX, tile.positionY),
-    y: tileToWorldY(props.tilemap, tile.positionX, tile.positionY),
+    x: tileToWorldX(props.tileMap, tile.positionX, tile.positionY),
+    y: tileToWorldY(props.tileMap, tile.positionX, tile.positionY),
     texture: tile.type,
     depth: 999
   }
 }
 
-function pencil(pointer: Phaser.Input.Pointer) {
-  // Check if map is set
-  if (!mapEditorStore.map) return
-
-  // Check if tool is pencil
-  if (mapEditorStore.tool !== 'pencil') return
-
-  // Check if draw mode is blocking tile or teleport
-  if (mapEditorStore.drawMode !== 'blocking tile' && mapEditorStore.drawMode !== 'teleport') return
-
-  // Check if left mouse button is pressed
-  if (!pointer.isDown) return
-
-  // Check if shift is not pressed, this means we are moving the camera
-  if (pointer.event.shiftKey) return
+function pencil(pointer: Phaser.Input.Pointer, map: MapT) {
+  if (!tileLayer.value) return
 
   // Check if there is a tile
-  const tile = getTile(props.tilemap, pointer.worldX, pointer.worldY)
+  const tile = getTile(tileLayer.value, pointer.worldX, pointer.worldY)
   if (!tile) return
 
   // Check if event tile already exists on position
-  const existingEventTile = mapEditorStore.map.mapEventTiles.find((eventTile) => eventTile.positionX === tile.x && eventTile.positionY === tile.y)
+  const existingEventTile = map.mapEventTiles.find((eventTile) => eventTile.positionX === tile.x && eventTile.positionY === tile.y)
   if (existingEventTile) return
 
   // If teleport, check if there is a selected map
-  if (mapEditorStore.drawMode === 'teleport' && !mapEditorStore.teleportSettings.toMap) return
+  if (mapEditor.drawMode.value === 'teleport' && !mapEditor.teleportSettings.value.toMapId) return
 
   const newEventTile = {
     id: uuidv4(),
-    mapId: mapEditorStore.map.id,
-    map: mapEditorStore.map,
-    type: mapEditorStore.drawMode === 'blocking tile' ? MapEventTileType.BLOCK : MapEventTileType.TELEPORT,
+    mapId: map?.id,
+    map: map?.id,
+    type: mapEditor.drawMode.value === 'blocking tile' ? MapEventTileType.BLOCK : MapEventTileType.TELEPORT,
     positionX: tile.x,
     positionY: tile.y,
     teleport:
-      mapEditorStore.drawMode === 'teleport'
+      mapEditor.drawMode.value === 'teleport'
         ? {
-            toMap: mapEditorStore.teleportSettings.toMap,
-            toPositionX: mapEditorStore.teleportSettings.toPositionX,
-            toPositionY: mapEditorStore.teleportSettings.toPositionY,
-            toRotation: mapEditorStore.teleportSettings.toRotation
+            toMap: mapEditor.teleportSettings.value.toMapId,
+            toPositionX: mapEditor.teleportSettings.value.toPositionX,
+            toPositionY: mapEditor.teleportSettings.value.toPositionY,
+            toRotation: mapEditor.teleportSettings.value.toRotation
           }
         : undefined
   }
 
-  mapEditorStore.map.mapEventTiles = mapEditorStore.map.mapEventTiles.concat(newEventTile as MapEventTile)
+  map!.mapEventTiles = map!.mapEventTiles.concat(newEventTile as MapEventTile)
 }
 
-function eraser(pointer: Phaser.Input.Pointer) {
-  // Check if map is set
-  if (!mapEditorStore.map) return
+function erase(pointer: Phaser.Input.Pointer, map: MapT) {
+  if (!tileLayer.value) return
+  // Check if there is a tile
+  const tile = getTile(tileLayer.value, pointer.worldX, pointer.worldY)
+  if (!tile) return
 
-  // Check if tool is pencil
-  if (mapEditorStore.tool !== 'eraser') return
+  // Check if event tile already exists on position
+  const existingEventTile = map.mapEventTiles.find((eventTile) => eventTile.positionX === tile.x && eventTile.positionY === tile.y)
+  if (!existingEventTile) return
 
-  // Check if draw mode is blocking tile or teleport
-  if (mapEditorStore.eraserMode !== 'blocking tile' && mapEditorStore.eraserMode !== 'teleport') return
+  // Remove existing event tile
+  map.mapEventTiles = map.mapEventTiles.filter((eventTile) => eventTile.id !== existingEventTile.id)
+}
+
+function handlePointer(pointer: Phaser.Input.Pointer) {
+  const map = mapEditor.currentMap.value
+  if (!map) return
 
   // Check if left mouse button is pressed
   if (!pointer.isDown) return
@@ -90,29 +88,13 @@ function eraser(pointer: Phaser.Input.Pointer) {
   // Check if shift is not pressed, this means we are moving the camera
   if (pointer.event.shiftKey) return
 
-  // Check if there is a tile
-  const tile = getTile(props.tilemap, pointer.worldX, pointer.worldY)
-  if (!tile) return
-
-  // Check if event tile already exists on position
-  const existingEventTile = mapEditorStore.map.mapEventTiles.find((eventTile) => eventTile.positionX === tile.x && eventTile.positionY === tile.y)
-  if (!existingEventTile) return
-
-  // Remove existing event tile
-  mapEditorStore.map.mapEventTiles = mapEditorStore.map.mapEventTiles.filter((eventTile) => eventTile.id !== existingEventTile.id)
+  switch (mapEditor.tool.value) {
+    case 'pencil':
+      pencil(pointer, map)
+      break
+    case 'eraser':
+      erase(pointer, map)
+      break
+  }
 }
-
-onMounted(() => {
-  scene.input.on(Phaser.Input.Events.POINTER_DOWN, pencil)
-  scene.input.on(Phaser.Input.Events.POINTER_MOVE, pencil)
-  scene.input.on(Phaser.Input.Events.POINTER_DOWN, eraser)
-  scene.input.on(Phaser.Input.Events.POINTER_MOVE, eraser)
-})
-
-onUnmounted(() => {
-  scene.input.off(Phaser.Input.Events.POINTER_DOWN, pencil)
-  scene.input.off(Phaser.Input.Events.POINTER_MOVE, pencil)
-  scene.input.off(Phaser.Input.Events.POINTER_DOWN, eraser)
-  scene.input.off(Phaser.Input.Events.POINTER_MOVE, eraser)
-})
 </script>

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

@@ -1,34 +1,33 @@
 <template>
-  <Controls :layer="tileLayer" :depth="0" />
+  <Controls v-if="tileLayer" :layer="tileLayer" :depth="0" />
 </template>
 
 <script setup lang="ts">
 import config from '@/application/config'
-import type { TextureData } from '@/application/types'
 import Controls from '@/components/utilities/Controls.vue'
 import { createTileArray, getTile, placeTile, setLayerTiles } from '@/composables/mapComposable'
-import { useGameStore } from '@/stores/gameStore'
-import { useMapEditorStore } from '@/stores/mapEditorStore'
+import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
+import { TileStorage } from '@/storage/storages'
 import { useScene } from 'phavuer'
-import { onMounted, onUnmounted, watch } from 'vue'
+import { onMounted, onUnmounted, shallowRef, watch } from 'vue'
+
+import Tileset = Phaser.Tilemaps.Tileset
 
 const emit = defineEmits(['tileMap:create'])
 
 const scene = useScene()
-const gameStore = useGameStore()
-const mapEditorStore = useMapEditorStore()
-const tileMap = createTileMap()
-const tileLayer = createTileLayer()
+const mapEditor = useMapEditorComposable()
+const tileStorage = new TileStorage()
+
+const tileMap = shallowRef<Phaser.Tilemaps.Tilemap>()
+const tileLayer = shallowRef<Phaser.Tilemaps.TilemapLayer>()
+
+defineExpose({ handlePointer })
 
-/**
- * A Tilemap is a container for Tilemap data.
- * This isn't a display object, rather, it holds data about the map and allows you to add tilesets and tilemap layers to it.
- * A map can have one or more tilemap layers, which are the display objects that actually render the tiles.
- */
 function createTileMap() {
   const mapData = new Phaser.Tilemaps.MapData({
-    width: mapEditorStore.map?.width,
-    height: mapEditorStore.map?.height,
+    width: mapEditor.currentMap.value?.width,
+    height: mapEditor.currentMap.value?.height,
     tileWidth: config.tile_size.width,
     tileHeight: config.tile_size.height,
     orientation: Phaser.Tilemaps.Orientation.ISOMETRIC,
@@ -37,126 +36,105 @@ function createTileMap() {
 
   const newTileMap = new Phaser.Tilemaps.Tilemap(scene, mapData)
   emit('tileMap:create', newTileMap)
-
   return newTileMap
 }
 
-/**
- * A Tileset is a combination of a single image containing the tiles and a container for data about each tile.
- */
-function createTileLayer() {
-  const tilesArray = gameStore.getLoadedAssetsByGroup('tiles')
+async function createTileLayer(currentTileMap: Phaser.Tilemaps.Tilemap) {
+  const tiles = await tileStorage.getAll()
+  const tilesetImages = []
 
-  const tilesetImages = Array.from(tilesArray).map((tile: TextureData, index: number) => {
-    return tileMap.addTilesetImage(tile.key, tile.key, config.tile_size.width, config.tile_size.height, 1, 2, index + 1, { x: 0, y: -config.tile_size.height })
-  }) as any
+  for (const tile of tiles) {
+    tilesetImages.push(currentTileMap.addTilesetImage(tile.id, tile.id, config.tile_size.width, config.tile_size.height, 1, 2, tilesetImages.length + 1, { x: 0, y: -config.tile_size.height }))
+  }
 
   // Add blank tile
-  tilesetImages.push(tileMap.addTilesetImage('blank_tile', 'blank_tile', config.tile_size.width, config.tile_size.height, 1, 2, 0, { x: 0, y: -config.tile_size.height }))
-  const layer = tileMap.createBlankLayer('tiles', tilesetImages, 0, config.tile_size.height) as Phaser.Tilemaps.TilemapLayer
+  tilesetImages.push(currentTileMap.addTilesetImage('blank_tile', 'blank_tile', config.tile_size.width, config.tile_size.height, 1, 2, 0, { x: 0, y: -config.tile_size.height }))
+
+  const layer = currentTileMap.createBlankLayer('tiles', tilesetImages as Tileset[], 0, config.tile_size.height) as Phaser.Tilemaps.TilemapLayer
 
   layer.setDepth(0)
   layer.setCullPadding(2, 2)
-
   return layer
 }
 
 function pencil(pointer: Phaser.Input.Pointer) {
-  // Check if map is set
-  if (!mapEditorStore.map) return
-
-  // Check if tool is pencil
-  if (mapEditorStore.tool !== 'pencil') return
-
-  // Check if draw mode is tile
-  if (mapEditorStore.drawMode !== 'tile') return
+  let map = mapEditor.currentMap.value
+  if (!map) return
 
   // Check if there is a selected tile
-  if (!mapEditorStore.selectedTile) return
+  if (!mapEditor.selectedTile.value) return
 
-  // Check if left mouse button is pressed
-  if (!pointer.isDown) return
-
-  // Check if shift is not pressed, this means we are moving the camera
-  if (pointer.event.shiftKey) return
+  if (!tileMap.value || !tileLayer.value) return
 
   // Check if there is a tile
-  const tile = getTile(tileLayer, pointer.worldX, pointer.worldY)
+  const tile = getTile(tileLayer.value, pointer.worldX, pointer.worldY)
   if (!tile) return
 
   // Place tile
-  placeTile(tileMap, tileLayer, tile.x, tile.y, mapEditorStore.selectedTile)
+  placeTile(tileMap.value, tileLayer.value, tile.x, tile.y, mapEditor.selectedTile.value)
 
   // Adjust mapEditorStore.map.tiles
-  mapEditorStore.map.tiles[tile.y][tile.x] = mapEditorStore.selectedTile
+  map.tiles[tile.y][tile.x] = mapEditor.selectedTile.value
 }
 
 function eraser(pointer: Phaser.Input.Pointer) {
-  // Check if map is set
-  if (!mapEditorStore.map) return
+  let map = mapEditor.currentMap.value
+  if (!map) return
 
-  // Check if tool is pencil
-  if (mapEditorStore.tool !== 'eraser') return
-
-  // Check if draw mode is tile
-  if (mapEditorStore.eraserMode !== 'tile') return
-
-  // Check if left mouse button is pressed
-  if (!pointer.isDown) return
-
-  // Check if shift is not pressed, this means we are moving the camera
-  if (pointer.event.shiftKey) return
-
-  // Check if alt is pressed
-  if (pointer.event.altKey) return
+  if (!tileMap.value || !tileLayer.value) return
 
   // Check if there is a tile
-  const tile = getTile(tileLayer, pointer.worldX, pointer.worldY)
+  const tile = getTile(tileLayer.value, pointer.worldX, pointer.worldY)
   if (!tile) return
 
   // Place tile
-  placeTile(tileMap, tileLayer, tile.x, tile.y, 'blank_tile')
+  placeTile(tileMap.value, tileLayer.value, tile.x, tile.y, 'blank_tile')
 
   // Adjust mapEditorStore.map.tiles
-  mapEditorStore.map.tiles[tile.y][tile.x] = 'blank_tile'
+  map.tiles[tile.y][tile.x] = 'blank_tile'
 }
 
 function paint(pointer: Phaser.Input.Pointer) {
-  // Check if map is set
-  if (!mapEditorStore.map) return
-
-  // Check if tool is pencil
-  if (mapEditorStore.tool !== 'paint') return
-
-  // Check if there is a selected tile
-  if (!mapEditorStore.selectedTile) return
-
-  // Check if left mouse button is pressed
-  if (!pointer.isDown) return
-
-  // Check if shift is not pressed, this means we are moving the camera
-  if (pointer.event.shiftKey) return
-
-  // Check if alt is pressed
-  if (pointer.event.altKey) return
-
+  if (!tileMap.value || !tileLayer.value) return
   // Set new tileArray with selected tile
-  setLayerTiles(tileMap, tileLayer, createTileArray(tileMap.width, tileMap.height, mapEditorStore.selectedTile))
+  const tileArray = createTileArray(tileMap.value.width, tileMap.value.height, mapEditor.selectedTile.value)
+  setLayerTiles(tileMap.value, tileLayer.value, tileArray)
 
   // Adjust mapEditorStore.map.tiles
-  mapEditorStore.map.tiles = createTileArray(tileMap.width, tileMap.height, mapEditorStore.selectedTile)
+  if (mapEditor.currentMap.value) {
+    mapEditor.currentMap.value.tiles = tileArray
+  }
 }
 
 // When alt is pressed, and the pointer is down, select the tile that the pointer is over
 function tilePicker(pointer: Phaser.Input.Pointer) {
-  // Check if map is set
-  if (!mapEditorStore.map) return
+  let map = mapEditor.currentMap.value
+  if (!map) return
 
-  // Check if tool is pencil
-  if (mapEditorStore.tool !== 'pencil') return
+  if (!tileMap.value || !tileLayer.value) return
 
-  // Check if draw mode is tile
-  if (mapEditorStore.drawMode !== 'tile') return
+  // Check if there is a tile
+  const tile = getTile(tileLayer.value, pointer.worldX, pointer.worldY)
+  if (!tile) return
+
+  // Select the tile
+  mapEditor.setSelectedTile(map.tiles[tile.y][tile.x])
+}
+
+watch(
+  () => mapEditor.shouldClearTiles,
+  (shouldClear) => {
+    if (shouldClear && mapEditor.currentMap.value && tileMap.value && tileLayer.value) {
+      const blankTiles = createTileArray(tileLayer.value.width, tileLayer.value.height, 'blank_tile')
+      setLayerTiles(tileMap.value, tileLayer.value, blankTiles)
+      mapEditor.currentMap.value.tiles = blankTiles
+      mapEditor.resetClearTilesFlag()
+    }
+  }
+)
+
+function handlePointer(pointer: Phaser.Input.Pointer) {
+  if (!tileMap.value || !tileLayer.value) return
 
   // Check if left mouse button is pressed
   if (!pointer.isDown) return
@@ -165,63 +143,52 @@ function tilePicker(pointer: Phaser.Input.Pointer) {
   if (pointer.event.shiftKey) return
 
   // Check if alt is pressed
-  if (!pointer.event.altKey) return
-
-  // Check if there is a tile
-  const tile = getTile(tileLayer, pointer.worldX, pointer.worldY)
-  if (!tile) return
-
-  // Select the tile
-  mapEditorStore.setSelectedTile(mapEditorStore.map.tiles[tile.y][tile.x])
-}
-
-watch(
-  () => mapEditorStore.shouldClearTiles,
-  (shouldClear) => {
-    if (shouldClear && mapEditorStore.map) {
-      const blankTiles = createTileArray(tileMap.width, tileMap.height, 'blank_tile')
-      setLayerTiles(tileMap, tileLayer, blankTiles)
-      mapEditorStore.map.tiles = blankTiles
-      mapEditorStore.resetClearTilesFlag()
-    }
-  }
-)
-
-onMounted(() => {
-  if (!mapEditorStore.map?.tiles) {
+  if (pointer.event.altKey) {
+    tilePicker(pointer)
     return
   }
 
+  // Check if draw mode is tile
+  switch (mapEditor.tool.value) {
+    case 'pencil':
+      pencil(pointer)
+      break
+    case 'eraser':
+      eraser(pointer)
+      break
+    case 'paint':
+      paint(pointer)
+      break
+  }
+}
+
+onMounted(async () => {
+  if (!mapEditor.currentMap.value) return
+
+  tileMap.value = createTileMap()
+  tileLayer.value = await createTileLayer(tileMap.value)
+
   // First fill the entire map with blank tiles using current map dimensions
-  const blankTiles = createTileArray(mapEditorStore.map.width, mapEditorStore.map.height, 'blank_tile')
+  const blankTiles = createTileArray(mapEditor.currentMap.value.width, mapEditor.currentMap.value.height, 'blank_tile')
 
   // Then overlay the map tiles, but only within the current map dimensions
-  const mapTiles = mapEditorStore.map.tiles
-  for (let y = 0; y < mapEditorStore.map.height; y++) {
-    for (let x = 0; x < mapEditorStore.map.width; x++) {
-      // Only copy if the source tiles array has this position
+  const mapTiles = mapEditor.currentMap.value.tiles
+  for (let y = 0; y < mapEditor.currentMap.value.height; y++) {
+    for (let x = 0; x < mapEditor.currentMap.value.width; x++) {
       if (mapTiles[y] && mapTiles[y][x] !== undefined) {
         blankTiles[y][x] = mapTiles[y][x]
       }
     }
   }
 
-  setLayerTiles(tileMap, tileLayer, blankTiles)
-
-  scene.input.on(Phaser.Input.Events.POINTER_MOVE, pencil)
-  scene.input.on(Phaser.Input.Events.POINTER_MOVE, eraser)
-  scene.input.on(Phaser.Input.Events.POINTER_DOWN, paint)
-  scene.input.on(Phaser.Input.Events.POINTER_DOWN, tilePicker)
+  setLayerTiles(tileMap.value, tileLayer.value, blankTiles)
 })
 
 onUnmounted(() => {
-  scene.input.off(Phaser.Input.Events.POINTER_MOVE, pencil)
-  scene.input.off(Phaser.Input.Events.POINTER_MOVE, eraser)
-  scene.input.off(Phaser.Input.Events.POINTER_DOWN, paint)
-  scene.input.off(Phaser.Input.Events.POINTER_DOWN, tilePicker)
-
-  tileMap.destroyLayer('tiles')
-  tileMap.removeAllLayers()
-  tileMap.destroy()
+  if (tileMap.value) {
+    tileMap.value.destroyLayer('tiles')
+    tileMap.value.removeAllLayers()
+    tileMap.value.destroy()
+  }
 })
 </script>

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

@@ -1,5 +1,5 @@
 <template>
-  <Image v-if="gameStore.getLoadedAsset(props.placedMapObject.mapObject.id)" v-bind="imageProps" />
+  <Image v-if="gameStore.isTextureLoaded(props.placedMapObject.mapObject.id)" v-bind="imageProps" />
 </template>
 
 <script setup lang="ts">
@@ -11,7 +11,7 @@ import { Image, useScene } from 'phavuer'
 import { computed } from 'vue'
 
 const props = defineProps<{
-  tilemap: Phaser.Tilemaps.Tilemap
+  tileMap: Phaser.Tilemaps.Tilemap
   placedMapObject: PlacedMapObject
   selectedPlacedMapObject: PlacedMapObject | null
   movingPlacedMapObject: PlacedMapObject | null
@@ -24,8 +24,8 @@ const imageProps = computed(() => ({
   alpha: props.movingPlacedMapObject?.id === props.placedMapObject.id ? 0.5 : 1,
   tint: props.selectedPlacedMapObject?.id === props.placedMapObject.id ? 0x00ff00 : 0xffffff,
   depth: calculateIsometricDepth(props.placedMapObject.positionX, props.placedMapObject.positionY, props.placedMapObject.mapObject.frameWidth, props.placedMapObject.mapObject.frameHeight),
-  x: tileToWorldX(props.tilemap, props.placedMapObject.positionX, props.placedMapObject.positionY),
-  y: tileToWorldY(props.tilemap, props.placedMapObject.positionX, props.placedMapObject.positionY),
+  x: tileToWorldX(props.tileMap, props.placedMapObject.positionX, props.placedMapObject.positionY),
+  y: tileToWorldY(props.tileMap, props.placedMapObject.positionX, props.placedMapObject.positionY),
   flipX: props.placedMapObject.isRotated,
   texture: props.placedMapObject.mapObject.id,
   originY: Number(props.placedMapObject.mapObject.originX),

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

@@ -1,147 +1,77 @@
 <template>
   <SelectedPlacedMapObjectComponent v-if="selectedPlacedMapObject" :placedMapObject="selectedPlacedMapObject" @move="moveMapObject" @rotate="rotatePlacedMapObject" @delete="deletePlacedMapObject" />
-  <PlacedMapObject v-for="placedMapObject in mapEditorStore.map?.placedMapObjects" :tilemap="tilemap" :placedMapObject :selectedPlacedMapObject :movingPlacedMapObject @pointerup="clickPlacedMapObject(placedMapObject)" />
+  <PlacedMapObject v-for="placedMapObject in mapEditor.currentMap.value?.placedMapObjects" :tileMap="tileMap" :placedMapObject :selectedPlacedMapObject :movingPlacedMapObject @pointerup="clickPlacedMapObject(placedMapObject)" />
 </template>
 
 <script setup lang="ts">
-import type { MapObject, PlacedMapObject as PlacedMapObjectT } from '@/application/types'
+import type { Map as MapT, PlacedMapObject as PlacedMapObjectT } from '@/application/types'
 import { uuidv4 } from '@/application/utilities'
 import PlacedMapObject from '@/components/gameMaster/mapEditor/mapPartials/PlacedMapObject.vue'
 import SelectedPlacedMapObjectComponent from '@/components/gameMaster/mapEditor/partials/SelectedPlacedMapObject.vue'
-import { getTile } from '@/composables/mapComposable'
-import { useMapEditorStore } from '@/stores/mapEditorStore'
+import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
 import { useScene } from 'phavuer'
-import { onMounted, onUnmounted, ref, watch } from 'vue'
+import { ref, watch } from 'vue'
 
 const scene = useScene()
-const mapEditorStore = useMapEditorStore()
+const mapEditor = useMapEditorComposable()
 const selectedPlacedMapObject = ref<PlacedMapObjectT | null>(null)
 const movingPlacedMapObject = ref<PlacedMapObjectT | null>(null)
 
 const props = defineProps<{
-  tilemap: Phaser.Tilemaps.Tilemap
+  tileMap: Phaser.Tilemaps.Tilemap
 }>()
 
-function pencil(pointer: Phaser.Input.Pointer) {
-  // Check if map is set
-  if (!mapEditorStore.map) return
-
-  // Check if tool is pencil
-  if (mapEditorStore.tool !== 'pencil') return
-
-  // Check if draw mode is map_object
-  if (mapEditorStore.drawMode !== 'map_object') return
-
-  // Check if there is a selected object
-  if (!mapEditorStore.selectedMapObject) return
-
-  // Check if left mouse button is pressed
-  if (!pointer.isDown) return
-
-  // Check if shift is not pressed, this means we are moving the camera
-  if (pointer.event.shiftKey) return
-
-  // Check if alt is pressed, this means we are selecting the object
-  if (pointer.event.altKey) return
-
-  // Check if there is a tile
-  const tile = getTile(props.tilemap, pointer.worldX, pointer.worldY)
-  if (!tile) return
+defineExpose({ handlePointer })
 
+function pencil(pointer: Phaser.Input.Pointer, map: MapT) {
   // Check if object already exists on position
-  const existingPlacedMapObject = mapEditorStore.map.placedMapObjects.find((placedMapObject) => placedMapObject.positionX === tile.x && placedMapObject.positionY === tile.y)
+  const existingPlacedMapObject = findInMap(pointer, map)
   if (existingPlacedMapObject) return
 
-  const newPlacedMapObject = {
+  const newPlacedMapObject: PlacedMapObjectT = {
     id: uuidv4(),
-    map: mapEditorStore.map,
-    mapObject: mapEditorStore.selectedMapObject,
     depth: 0,
+    map: map,
+    mapObject: mapEditor.selectedMapObject.value!,
     isRotated: false,
-    positionX: tile.x,
-    positionY: tile.y
+    positionX: pointer.x,
+    positionY: pointer.y
   }
 
   // Add new object to mapObjects
-  mapEditorStore.map.placedMapObjects = mapEditorStore.map.placedMapObjects.concat(newPlacedMapObject as PlacedMapObjectT)
+  map.placedMapObjects.concat(newPlacedMapObject)
 }
 
-function eraser(pointer: Phaser.Input.Pointer) {
-  // Check if map is set
-  if (!mapEditorStore.map) return
-
-  // Check if tool is eraser
-  if (mapEditorStore.tool !== 'eraser') return
-
-  // Check if draw mode is map_object
-  if (mapEditorStore.eraserMode !== 'map_object') return
-
-  // Check if left mouse button is pressed
-  if (!pointer.isDown) return
-
-  // Check if shift is not pressed, this means we are moving the camera
-  if (pointer.event.shiftKey) return
-
-  // Check if alt is pressed, this means we are selecting the object
-  if (pointer.event.altKey) return
-
-  // Check if there is a tile
-  const tile = getTile(props.tilemap, pointer.worldX, pointer.worldY)
-  if (!tile) return
-
+function eraser(pointer: Phaser.Input.Pointer, map: MapT) {
   // Check if object already exists on position
-  const existingPlacedMapObject = mapEditorStore.map.placedMapObjects.find((placedMapObject) => placedMapObject.positionX === tile.x && placedMapObject.positionY === tile.y)
+  const existingPlacedMapObject = findInMap(pointer, map)
   if (!existingPlacedMapObject) return
 
   // Remove existing object
-  mapEditorStore.map.placedMapObjects = mapEditorStore.map.placedMapObjects.filter((placedMapObject) => placedMapObject.id !== existingPlacedMapObject.id)
+  map.placedMapObjects = map.placedMapObjects.filter((placedMapObject) => placedMapObject.id !== existingPlacedMapObject.id)
 }
 
-function objectPicker(pointer: Phaser.Input.Pointer) {
-  // Check if map is set
-  if (!mapEditorStore.map) return
-
-  // Check if tool is pencil
-  if (mapEditorStore.tool !== 'pencil') return
-
-  // Check if draw mode is map_object
-  if (mapEditorStore.drawMode !== 'map_object') return
-
-  // Check if left mouse button is pressed
-  if (!pointer.isDown) return
-
-  // Check if shift is not pressed, this means we are moving the camera
-  if (pointer.event.shiftKey) return
-
-  // If alt is not pressed, return
-  if (!pointer.event.altKey) return
-
-  // Check if there is a tile
-  const tile = getTile(props.tilemap, pointer.worldX, pointer.worldY)
-  if (!tile) return
+function findInMap(pointer: Phaser.Input.Pointer, map: MapT) {
+  return map.placedMapObjects.find((placedMapObject) => placedMapObject.positionX === pointer.worldX && placedMapObject.positionY === pointer.worldY)
+}
 
+function objectPicker(pointer: Phaser.Input.Pointer, map: MapT) {
   // Check if object already exists on position
-  const existingPlacedMapObject = mapEditorStore.map.placedMapObjects.find((placedMapObject) => placedMapObject.positionX === tile.x && placedMapObject.positionY === tile.y)
+  const existingPlacedMapObject = findInMap(pointer, map)
   if (!existingPlacedMapObject) return
 
   // Select the object
-  mapEditorStore.setSelectedMapObject(existingPlacedMapObject.mapObject)
+  mapEditor.setSelectedMapObject(existingPlacedMapObject.mapObject)
 }
 
-function moveMapObject(id: string) {
-  // Check if map is set
-  if (!mapEditorStore.map) return
-
-  movingPlacedMapObject.value = mapEditorStore.map.placedMapObjects.find((object) => object.id === id) as PlacedMapObjectT
+function moveMapObject(id: string, map: MapT) {
+  movingPlacedMapObject.value = map.placedMapObjects.find((object) => object.id === id) as PlacedMapObjectT
 
   function handlePointerMove(pointer: Phaser.Input.Pointer) {
     if (!movingPlacedMapObject.value) return
 
-    const tile = getTile(props.tilemap, pointer.worldX, pointer.worldY)
-    if (!tile) return
-
-    movingPlacedMapObject.value.positionX = tile.x
-    movingPlacedMapObject.value.positionY = tile.y
+    movingPlacedMapObject.value.positionX = pointer.worldX
+    movingPlacedMapObject.value.positionY = pointer.worldY
   }
 
   scene.input.on(Phaser.Input.Events.POINTER_MOVE, handlePointerMove)
@@ -154,11 +84,8 @@ function moveMapObject(id: string) {
   scene.input.on(Phaser.Input.Events.POINTER_UP, handlePointerUp)
 }
 
-function rotatePlacedMapObject(id: string) {
-  // Check if map is set
-  if (!mapEditorStore.map) return
-
-  mapEditorStore.map.placedMapObjects = mapEditorStore.map.placedMapObjects.map((placedMapObject) => {
+function rotatePlacedMapObject(id: string, map: MapT) {
+  map.placedMapObjects = map.placedMapObjects.map((placedMapObject) => {
     if (placedMapObject.id === id) {
       return {
         ...placedMapObject,
@@ -169,11 +96,8 @@ function rotatePlacedMapObject(id: string) {
   })
 }
 
-function deletePlacedMapObject(id: string) {
-  // Check if map is set
-  if (!mapEditorStore.map) return
-
-  mapEditorStore.map.placedMapObjects = mapEditorStore.map.placedMapObjects.filter((object) => object.id !== id)
+function deletePlacedMapObject(id: string, map: MapT) {
+  map.placedMapObjects = map.placedMapObjects.filter((object) => object.id !== id)
   selectedPlacedMapObject.value = null
 }
 
@@ -182,41 +106,55 @@ function clickPlacedMapObject(placedMapObject: PlacedMapObjectT) {
 
   // If alt is pressed, select the object
   if (scene.input.activePointer.event.altKey) {
-    mapEditorStore.setSelectedMapObject(placedMapObject.mapObject)
+    mapEditor.setSelectedMapObject(placedMapObject.mapObject)
   }
 }
 
-onMounted(() => {
-  scene.input.on(Phaser.Input.Events.POINTER_DOWN, pencil)
-  scene.input.on(Phaser.Input.Events.POINTER_MOVE, pencil)
-  scene.input.on(Phaser.Input.Events.POINTER_DOWN, eraser)
-  scene.input.on(Phaser.Input.Events.POINTER_MOVE, eraser)
-  scene.input.on(Phaser.Input.Events.POINTER_DOWN, objectPicker)
-})
+function handlePointer(pointer: Phaser.Input.Pointer) {
+  const map = mapEditor.currentMap.value
+  if (!map) return
 
-onUnmounted(() => {
-  scene.input.off(Phaser.Input.Events.POINTER_DOWN, pencil)
-  scene.input.off(Phaser.Input.Events.POINTER_MOVE, pencil)
-  scene.input.off(Phaser.Input.Events.POINTER_DOWN, eraser)
-  scene.input.off(Phaser.Input.Events.POINTER_MOVE, eraser)
-  scene.input.off(Phaser.Input.Events.POINTER_DOWN, objectPicker)
-})
+  if (mapEditor.drawMode.value !== 'map_object') return
+
+  // Check if left mouse button is pressed
+  if (!pointer.isDown) return
+
+  // Check if shift is not pressed, this means we are moving the camera
+  if (pointer.event.shiftKey) return
+
+  // Check if alt is pressed, this means we are selecting the object
+  if (pointer.event.altKey) return
+
+  // Check if tool is pencil
+  switch (mapEditor.tool.value) {
+    case 'pencil':
+      if (mapEditor.selectedMapObject.value) pencil(pointer, map)
+      break
+    case 'eraser':
+      eraser(pointer, map)
+      break
+    case 'object picker':
+      objectPicker(pointer, map)
+      break
+  }
+}
 
 // watch mapEditorStore.mapObjectList and update originX and originY of objects in mapObjects
 watch(
-  () => mapEditorStore.mapObjectList,
-  (newMapObjects) => {
-    if (!mapEditorStore.map) return
+  () => mapEditor.currentMap.value,
+  () => {
+    const map = mapEditor.currentMap.value
+    if (!map) return
 
-    const updatedMapObjects = mapEditorStore.map.placedMapObjects.map((mapObject) => {
-      const updatedMapObject = newMapObjects.find((obj) => obj.id === mapObject.mapObject.id)
+    const updatedMapObjects = map.placedMapObjects.map((mapObject) => {
+      const updatedMapObject = map.placedMapObjects.find((obj) => obj.id === mapObject.mapObject.id)
       if (updatedMapObject) {
         return {
           ...mapObject,
           mapObject: {
             ...mapObject.mapObject,
-            originX: updatedMapObject.originX,
-            originY: updatedMapObject.originY
+            originX: updatedMapObject.positionX,
+            originY: updatedMapObject.positionY
           }
         }
       }
@@ -224,19 +162,16 @@ watch(
     })
 
     // Update the map with the new mapObjects
-    mapEditorStore.setMap({
-      ...mapEditorStore.map,
-      placedMapObjects: updatedMapObjects
-    })
+    map.placedMapObjects = [...map.placedMapObjects, ...updatedMapObjects]
 
-    // Update selectedMapObject if it's set
-    if (mapEditorStore.selectedMapObject) {
-      const updatedMapObject = newMapObjects.find((obj) => obj.id === mapEditorStore.selectedMapObject?.id)
+    // Update mapObject if it's set
+    if (mapEditor.selectedMapObject.value) {
+      const updatedMapObject = map.placedMapObjects.find((obj) => obj.id === mapEditor.selectedMapObject.value?.id)
       if (updatedMapObject) {
-        mapEditorStore.setSelectedMapObject({
-          ...mapEditorStore.selectedMapObject,
-          originX: updatedMapObject.originX,
-          originY: updatedMapObject.originY
+        mapEditor.setSelectedMapObject({
+          ...mapEditor.selectedMapObject.value,
+          originX: updatedMapObject.positionX,
+          originY: updatedMapObject.positionY
         })
       }
     }

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

@@ -1,9 +1,8 @@
 <template>
-  <Modal :isModalOpen="true" @modal:close="() => mapEditorStore.toggleCreateMapModal()" :modal-width="300" :modal-height="420" :is-resizable="false" :bg-style="'none'">
+  <Modal ref="modalRef" :modal-width="300" :modal-height="420" :is-resizable="false" :bg-style="'none'">
     <template #modalHeader>
       <h3 class="m-0 font-medium shrink-0 text-white">Create new map</h3>
     </template>
-
     <template #modalBody>
       <div class="m-4">
         <form method="post" @submit.prevent="submit" class="inline">
@@ -14,15 +13,15 @@
             </div>
             <div class="form-field-half">
               <label for="name">Width</label>
-              <input class="input-field max-w-64" v-model="width" name="name" id="name" type="number" />
+              <input class="input-field max-w-64" v-model="width" name="width" id="width" type="number" />
             </div>
             <div class="form-field-half">
               <label for="name">Height</label>
-              <input class="input-field max-w-64" v-model="height" name="name" id="name" type="number" />
+              <input class="input-field max-w-64" v-model="height" name="height" id="height" type="number" />
             </div>
             <div class="form-field-full">
               <label for="name">PVP enabled</label>
-              <select class="input-field" name="pvp" id="pvp">
+              <select class="input-field" v-model="pvp" name="pvp" id="pvp">
                 <option :value="false">No</option>
                 <option :value="true">Yes</option>
               </select>
@@ -38,21 +37,50 @@
 <script setup lang="ts">
 import type { Map } from '@/application/types'
 import Modal from '@/components/utilities/Modal.vue'
+import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
+import { MapStorage } from '@/storage/storages'
 import { useGameStore } from '@/stores/gameStore'
-import { useMapEditorStore } from '@/stores/mapEditorStore'
-import { ref } from 'vue'
+import { ref, useTemplateRef } from 'vue'
+
+const emit = defineEmits(['create'])
 
 const gameStore = useGameStore()
-const mapEditorStore = useMapEditorStore()
+const mapStorage = new MapStorage()
+const modalRef = useTemplateRef('modalRef')
 
 const name = ref('')
 const width = ref(0)
 const height = ref(0)
+const pvp = ref(false)
 
-function submit() {
-  gameStore.connection?.emit('gm:map:create', { name: name.value, width: width.value, height: height.value }, (response: Map[]) => {
-    mapEditorStore.setMapList(response)
+defineExpose({ open: () => modalRef.value?.open() })
+
+async function submit() {
+  gameStore.connection?.emit('gm:map:create', { name: name.value, width: width.value, height: height.value }, async (response: Map | false) => {
+    if (!response) {
+      gameStore.addNotification({
+        title: 'Error',
+        message: 'Failed to create map.'
       })
-  mapEditorStore.toggleCreateMapModal()
+      return
+    }
+
+    // Reset form
+    name.value = ''
+    width.value = 0
+    height.value = 0
+    pvp.value = false
+
+    // Add map to storage
+
+    console.log(response)
+    await mapStorage.add(response)
+
+    // Let list know to fetch new maps
+    emit('create')
+  })
+
+  // Close modal
+  modalRef.value?.close()
 }
 </script>

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

@@ -1,16 +1,16 @@
 <template>
-  <CreateMap v-if="mapEditorStore.isCreateMapModalShown" />
-  <Modal :is-modal-open="mapEditorStore.isMapListModalShown" @modal:close="() => mapEditorStore.toggleMapListModal()" :is-resizable="false" :modal-width="300" :modal-height="360" :bg-style="'none'">
+  <Modal ref="modalRef" :is-resizable="false" :modal-width="300" :modal-height="360" :bg-style="'none'">
     <template #modalHeader>
       <h3 class="text-lg text-white">Maps</h3>
     </template>
     <template #modalBody>
-      <div class="my-4 mx-auto">
+      <div class="my-4 mx-auto h-full">
         <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="() => mapEditorStore.toggleCreateMapModal()">New</button>
+          <button class="btn-cyan py-1.5 min-w-[calc(50%_-_5px)]" @click="createMapModal?.open">New</button>
         </div>
-        <div class="relative p-2.5 cursor-pointer flex gap-y-2.5 gap-x-5 flex-wrap" v-for="(map, index) in mapEditorStore.mapList" :key="map.id">
+        <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>
@@ -21,41 +21,64 @@
             <div class="absolute left-0 bottom-0 w-full h-px bg-gray-500"></div>
           </div>
         </div>
+      </div>
     </template>
   </Modal>
+
+  <CreateMap ref="createMapModal" @create="fetchMaps" />
 </template>
 
 <script setup lang="ts">
 import type { Map, UUID } 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 { MapStorage } from '@/storage/storages'
 import { useGameStore } from '@/stores/gameStore'
 import { useMapEditorStore } from '@/stores/mapEditorStore'
-import { onMounted } from 'vue'
+import { onMounted, ref, useTemplateRef } from 'vue'
 
 const gameStore = useGameStore()
-const mapEditorStore = useMapEditorStore()
+
+const mapEditor = useMapEditorComposable()
+const mapStorage = new MapStorage()
+const mapList = ref<Map[]>([])
+const modalRef = useTemplateRef('modalRef')
+const createMapModal = useTemplateRef('createMapModal')
+
+defineEmits(['open-create-map'])
+
+defineExpose({
+  open: () => modalRef.value?.open()
+})
 
 onMounted(async () => {
-  fetchMaps()
+  await fetchMaps()
 })
 
-function fetchMaps() {
-  gameStore.connection?.emit('gm:map:list', {}, (response: Map[]) => {
-    mapEditorStore.setMapList(response)
-  })
+async function fetchMaps() {
+  mapList.value = await mapStorage.getAll()
 }
 
 function loadMap(id: UUID) {
   gameStore.connection?.emit('gm:map:request', { mapId: id }, (response: Map) => {
-    mapEditorStore.setMap(response)
+    mapEditor.loadMap(response)
   })
-  mapEditorStore.toggleMapListModal()
+  modalRef.value?.close()
 }
 
-function deleteMap(id: UUID) {
-  gameStore.connection?.emit('gm:map:delete', { mapId: id }, () => {
-    fetchMaps()
+async function deleteMap(id: UUID) {
+  gameStore.connection?.emit('gm:map:delete', { mapId: id }, async (response: boolean) => {
+    if (!response) {
+      gameStore.addNotification({
+        title: 'Error',
+        message: 'Failed to delete map.'
+      })
+      return
+    }
+
+    await mapStorage.delete(id)
+    await fetchMaps()
   })
 }
 </script>

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

@@ -1,9 +1,11 @@
 <template>
-  <Modal :isModalOpen="mapEditorStore.isMapObjectListModalShown" :modal-width="645" :modal-height="260" @modal:close="() => (mapEditorStore.isMapObjectListModalShown = false)" :bg-style="'none'">
-    <template #modalHeader>
+  <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 z-20" v-if="isOpen">
+    <div class="relative z-10 p-2.5 border-solid border-0 border-b border-gray-500">
       <h3 class="text-lg text-white">Map objects</h3>
-    </template>
-    <template #modalBody>
+    </div>
+    <div class="overflow-hidden grow relative">
+      <div class="absolute w-full h-full top-0 left-0">
+        <div class="relative z-10 h-full">
           <div class="flex pt-4 pl-4">
             <div class="w-full flex gap-1.5 flex-row">
               <div>
@@ -12,7 +14,7 @@
               </div>
             </div>
           </div>
-      <div class="flex flex-col h-full p-4">
+          <div class="flex flex-col h-[calc(100%_-_170px)] p-4 pb-24">
             <div class="mb-4 flex flex-wrap gap-2">
               <button v-for="tag in uniqueTags" :key="tag" @click="toggleTag(tag)" class="btn-cyan" :class="{ 'opacity-50': !selectedTags.includes(tag) }">
                 {{ tag }}
@@ -22,45 +24,54 @@
               <div class="flex justify-between flex-wrap gap-2.5 items-center">
                 <div v-for="(mapObject, index) in filteredMapObjects" :key="index" class="max-w-1/4 inline-block">
                   <img
-                class="border-2 border-solid max-w-full"
+                    class="border-2 border-solid rounded max-w-full"
                     :src="`${config.server_endpoint}/textures/map_objects/${mapObject.id}.png`"
                     alt="Object"
-                @click="mapEditorStore.setSelectedMapObject(mapObject)"
+                    @click="mapEditor.setSelectedMapObject(mapObject)"
                     :class="{
                       'cursor-pointer transition-all duration-300': true,
-                  'border-cyan shadow-lg scale-105': mapEditorStore.selectedMapObject?.id === mapObject.id,
-                  'border-transparent hover:border-gray-300': mapEditorStore.selectedMapObject?.id !== mapObject.id
+                      'border-cyan shadow-lg': mapEditor.selectedMapObject.value?.id === mapObject.id,
+                      'border-transparent hover:border-gray-300': mapEditor.selectedMapObject.value?.id !== mapObject.id
                     }"
                   />
                 </div>
               </div>
             </div>
           </div>
-    </template>
-  </Modal>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script setup lang="ts">
 import config from '@/application/config'
 import type { MapObject } from '@/application/types'
-import Modal from '@/components/utilities/Modal.vue'
-import { useGameStore } from '@/stores/gameStore'
-import { useMapEditorStore } from '@/stores/mapEditorStore'
-import { computed, onMounted, ref } from 'vue'
+import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
+import { MapObjectStorage } from '@/storage/storages'
+import { liveQuery } from 'dexie'
+import { computed, onMounted, onUnmounted, ref } from 'vue'
 
-const gameStore = useGameStore()
-const isModalOpen = ref(false)
-const mapEditorStore = useMapEditorStore()
+defineExpose({
+  open: () => (isOpen.value = true),
+  close: () => (isOpen.value = false),
+  toggle: () => (isOpen.value = !isOpen.value)
+})
+
+const isOpen = ref(false)
+const mapObjectStorage = new MapObjectStorage()
+const mapEditor = useMapEditorComposable()
 const searchQuery = ref('')
 const selectedTags = ref<string[]>([])
+const mapObjectList = ref<MapObject[]>([])
 
 const uniqueTags = computed(() => {
-  const allTags = mapEditorStore.mapObjectList.flatMap((obj) => obj.tags || [])
+  const allTags = mapObjectList.value.flatMap((obj) => obj.tags || [])
   return Array.from(new Set(allTags))
 })
 
 const filteredMapObjects = computed(() => {
-  return mapEditorStore.mapObjectList.filter((object) => {
+  return mapObjectList.value.filter((object) => {
     const matchesSearch = !searchQuery.value || object.name.toLowerCase().includes(searchQuery.value.toLowerCase())
     const matchesTags = selectedTags.value.length === 0 || (object.tags && selectedTags.value.some((tag) => object.tags.includes(tag)))
     return matchesSearch && matchesTags
@@ -75,10 +86,22 @@ const toggleTag = (tag: string) => {
   }
 }
 
-onMounted(async () => {
-  isModalOpen.value = true
-  gameStore.connection?.emit('gm:mapObject:list', {}, (response: MapObject[]) => {
-    mapEditorStore.setMapObjectList(response)
+let subscription: any = null
+
+onMounted(() => {
+  subscription = liveQuery(() => mapObjectStorage.liveQuery()).subscribe({
+    next: (result) => {
+      mapObjectList.value = result
+    },
+    error: (error) => {
+      console.error('Failed to fetch objects:', error)
+    }
   })
 })
+
+onUnmounted(() => {
+  if (subscription) {
+    subscription.unsubscribe()
+  }
+})
 </script>

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

@@ -1,5 +1,5 @@
 <template>
-  <Modal :is-modal-open="mapEditorStore.isSettingsModalShown" @modal:close="() => mapEditorStore.toggleSettingsModal()" :modal-width="600" :modal-height="430" :bg-style="'none'">
+  <Modal ref="modalRef" :modal-width="600" :modal-height="430" :bg-style="'none'">
     <template #modalHeader>
       <h3 class="m-0 font-medium shrink-0 text-white">Map settings</h3>
     </template>
@@ -46,61 +46,57 @@
   </Modal>
 </template>
 
-<script setup>
+<script setup lang="ts">
+import type { UUID } from '@/application/types'
+import { uuidv4 } from '@/application/utilities'
 import Modal from '@/components/utilities/Modal.vue'
-import { useMapEditorStore } from '@/stores/mapEditorStore'
-import { ref, watch } from 'vue'
+import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
+import { ref, useTemplateRef, watch } from 'vue'
 
-const mapEditorStore = useMapEditorStore()
+const mapEditor = useMapEditorComposable()
 const screen = ref('settings')
 
-mapEditorStore.setMapName(mapEditorStore.map?.name)
-mapEditorStore.setMapWidth(mapEditorStore.map?.width)
-mapEditorStore.setMapHeight(mapEditorStore.map?.height)
-mapEditorStore.setMapPvp(mapEditorStore.map?.pvp)
-mapEditorStore.setMapEffects(mapEditorStore.map?.mapEffects)
+const name = ref(mapEditor.currentMap.value?.name)
+const width = ref(mapEditor.currentMap.value?.width)
+const height = ref(mapEditor.currentMap.value?.height)
+const pvp = ref(mapEditor.currentMap.value?.pvp)
+const mapEffects = ref(mapEditor.currentMap.value?.mapEffects || [])
+const modalRef = useTemplateRef('modalRef')
 
-const name = ref(mapEditorStore.mapSettings?.name)
-const width = ref(mapEditorStore.mapSettings?.width)
-const height = ref(mapEditorStore.mapSettings?.height)
-const pvp = ref(mapEditorStore.mapSettings?.pvp)
-const mapEffects = ref(mapEditorStore.mapSettings?.mapEffects || [])
+defineExpose({
+  open: () => modalRef.value?.open()
+})
 
 watch(name, (value) => {
-  mapEditorStore.setMapName(value)
+  mapEditor.updateProperty('name', value!)
 })
 
 watch(width, (value) => {
-  mapEditorStore.setMapWidth(value)
+  mapEditor.updateProperty('width', value!)
 })
 
 watch(height, (value) => {
-  mapEditorStore.setMapHeight(value)
+  mapEditor.updateProperty('height', value!)
 })
 
 watch(pvp, (value) => {
-  mapEditorStore.setMapPvp(value)
+  mapEditor.updateProperty('pvp', value!)
 })
 
-watch(
-  mapEffects,
-  (value) => {
-    mapEditorStore.setMapEffects(value)
-  },
-  { deep: true }
-)
+watch(mapEffects, (value) => {
+  mapEditor.updateProperty('mapEffects', value!)
+})
 
 const addEffect = () => {
   mapEffects.value.push({
-    id: Date.now().toString(), // Simple unique id generation
-    mapId: mapEditorStore.map?.id,
-    map: mapEditorStore.map,
+    id: uuidv4() as UUID, // Simple unique id generation
+    map: mapEditor.currentMap.value!,
     effect: '',
     strength: 1
   })
 }
 
-const removeEffect = (index) => {
+const removeEffect = (index: number) => {
   mapEffects.value.splice(index, 1)
 }
 </script>

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

@@ -17,8 +17,6 @@ const props = defineProps<{
   placedMapObject: PlacedMapObject
 }>()
 
-console.log(props.placedMapObject)
-
 const emit = defineEmits(['move', 'rotate', 'delete'])
 
 const handleMove = () => {

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

@@ -1,5 +1,5 @@
 <template>
-  <Modal :is-modal-open="showTeleportModal" @modal:close="() => mapEditorStore.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 mapEditorStore.mapList" :key="map.id" :value="map">{{ map.name }}</option>
+                <option v-for="map in mapList" :key="map.id" :value="map">{{ map.name }}</option>
               </select>
             </div>
           </div>
@@ -43,17 +43,23 @@ import type { Map } from '@/application/types'
 import Modal from '@/components/utilities/Modal.vue'
 import { useGameStore } from '@/stores/gameStore'
 import { useMapEditorStore } from '@/stores/mapEditorStore'
-import { computed, onMounted, ref, watch } from 'vue'
+import { computed, onMounted, ref, useTemplateRef, watch } from 'vue'
 
 const showTeleportModal = computed(() => mapEditorStore.tool === 'pencil' && mapEditorStore.drawMode === 'teleport')
 const mapEditorStore = useMapEditorStore()
 const gameStore = useGameStore()
+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[]) => {
-    mapEditorStore.setMapList(response)
+    mapList.value = response
   })
 }
 
@@ -65,7 +71,7 @@ function useRefTeleportSettings() {
     toPositionX: ref(settings.toPositionX),
     toPositionY: ref(settings.toPositionY),
     toRotation: ref(settings.toRotation),
-    toMap: ref(settings.toMap)
+    toMap: ref(settings.toMapId)
   }
 }
 
@@ -76,7 +82,7 @@ function updateTeleportSettings() {
     toPositionX: toPositionX.value,
     toPositionY: toPositionY.value,
     toRotation: toRotation.value,
-    toMap: toMap.value
+    toMapId: toMap.value
   })
 }
 </script>

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

@@ -1,10 +1,12 @@
 <template>
-  <Modal :isModalOpen="mapEditorStore.isTileListModalShown" :modal-width="645" :modal-height="600" @modal:close="() => (mapEditorStore.isTileListModalShown = false)" :bg-style="'none'">
-    <template #modalHeader>
+  <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 z-20" v-if="isOpen">
+    <div class="relative z-10 p-2.5 border-solid border-0 border-b border-gray-500">
       <h3 class="text-lg text-white">Tiles</h3>
-    </template>
-    <template #modalBody>
-      <div class="h-full overflow-auto" v-if="!selectedGroup">
+    </div>
+    <div class="overflow-hidden grow relative">
+      <div class="absolute top-0 left-0 h-full w-full">
+        <div class="relative z-10 h-full">
+          <div class="h-full" v-if="!selectedGroup">
             <div class="flex pt-4 pl-4">
               <div class="w-full flex gap-1.5 flex-row">
                 <div>
@@ -13,23 +15,23 @@
                 </div>
               </div>
             </div>
-        <div class="flex flex-col h-full p-4">
+            <div class="flex flex-col h-[calc(100%_-_170px)] p-4 pb-24">
               <div class="mb-4 flex flex-wrap gap-2">
                 <button v-for="tag in uniqueTags" :key="tag" @click="toggleTag(tag)" class="btn-cyan" :class="{ 'opacity-50': !selectedTags.includes(tag) }">
                   {{ tag }}
                 </button>
               </div>
-          <div class="h-[calc(100%_-_60px)] flex-grow overflow-y-auto">
-            <div class="grid grid-cols-8 gap-2 justify-items-center">
+              <div class="h-full flex-grow overflow-y-auto">
+                <div class="grid grid-cols-4 gap-2 justify-items-center">
                   <div v-for="group in groupedTiles" :key="group.parent.id" class="flex flex-col items-center justify-center relative">
                     <img
-                  class="max-w-full max-h-full border-2 border-solid cursor-pointer transition-all duration-300"
+                      class="max-w-full max-h-full border-2 border-solid rounded cursor-pointer transition-all duration-300"
                       :src="`${config.server_endpoint}/textures/tiles/${group.parent.id}.png`"
                       :alt="group.parent.name"
                       @click="openGroup(group)"
-                  @load="() => processTile(group.parent)"
+                      @load="() => tileProcessor.processTile(group.parent)"
                       :class="{
-                    'border-cyan shadow-lg scale-105': isActiveTile(group.parent),
+                        'border-cyan shadow-lg': isActiveTile(group.parent),
                         'border-transparent hover:border-gray-300': !isActiveTile(group.parent)
                       }"
                     />
@@ -46,15 +48,15 @@
             <div class="p-4">
               <button @click="closeGroup" class="btn-cyan mb-4">Back to All Tiles</button>
               <h4 class="text-lg mb-4">{{ selectedGroup.parent.name }} Group</h4>
-          <div class="grid grid-cols-8 gap-2 justify-items-center">
+              <div class="grid grid-cols-4 gap-2 justify-items-center">
                 <div class="flex flex-col items-center justify-center">
                   <img
-                class="max-w-full max-h-full border-2 border-solid cursor-pointer transition-all duration-300"
+                    class="max-w-full max-h-full border-2 border-solid rounded cursor-pointer transition-all duration-300"
                     :src="`${config.server_endpoint}/textures/tiles/${selectedGroup.parent.id}.png`"
                     :alt="selectedGroup.parent.name"
                     @click="selectTile(selectedGroup.parent.id)"
                     :class="{
-                  'border-cyan shadow-lg scale-105': isActiveTile(selectedGroup.parent),
+                      'border-cyan shadow-lg': isActiveTile(selectedGroup.parent),
                       'border-transparent hover:border-gray-300': !isActiveTile(selectedGroup.parent)
                     }"
                   />
@@ -62,12 +64,12 @@
                 </div>
                 <div v-for="childTile in selectedGroup.children" :key="childTile.id" class="flex flex-col items-center justify-center">
                   <img
-                class="max-w-full max-h-full border-2 border-solid cursor-pointer transition-all duration-300"
+                    class="max-w-full max-h-full border-2 border-solid rounded cursor-pointer transition-all duration-300"
                     :src="`${config.server_endpoint}/textures/tiles/${childTile.id}.png`"
                     :alt="childTile.name"
                     @click="selectTile(childTile.id)"
                     :class="{
-                  'border-cyan shadow-lg scale-105': isActiveTile(childTile),
+                      'border-cyan shadow-lg': isActiveTile(childTile),
                       'border-transparent hover:border-gray-300': !isActiveTile(childTile)
                     }"
                   />
@@ -76,41 +78,51 @@
               </div>
             </div>
           </div>
-    </template>
-  </Modal>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script setup lang="ts">
 import config from '@/application/config'
 import type { Tile } from '@/application/types'
-import Modal from '@/components/utilities/Modal.vue'
-import { useGameStore } from '@/stores/gameStore'
-import { useMapEditorStore } from '@/stores/mapEditorStore'
-import { computed, onMounted, ref } from 'vue'
+import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
+import { useTileProcessingComposable } from '@/composables/useTileProcessingComposable'
+import { TileStorage } from '@/storage/storages'
+import { computed, onMounted, onUnmounted, ref } from 'vue'
 
-const gameStore = useGameStore()
-const isModalOpen = ref(false)
-const mapEditorStore = useMapEditorStore()
+const isOpen = ref(false)
+const tileStorage = new TileStorage()
+const mapEditor = useMapEditorComposable()
+const tileProcessor = useTileProcessingComposable()
 const searchQuery = ref('')
 const selectedTags = ref<string[]>([])
 const tileCategories = ref<Map<string, string>>(new Map())
 const selectedGroup = ref<{ parent: Tile; children: Tile[] } | null>(null)
+const tiles = ref<Tile[]>([])
+
+defineExpose({
+  open: () => (isOpen.value = true),
+  close: () => (isOpen.value = false),
+  toggle: () => (isOpen.value = !isOpen.value)
+})
 
 const uniqueTags = computed(() => {
-  const allTags = mapEditorStore.tileList.flatMap((tile) => tile.tags || [])
+  const allTags = tiles.value.flatMap((tile) => tile.tags || [])
   return Array.from(new Set(allTags))
 })
 
 const groupedTiles = computed(() => {
   const groups: { parent: Tile; children: Tile[] }[] = []
-  const filteredTiles = mapEditorStore.tileList.filter((tile) => {
+  const filteredTiles = tiles.value.filter((tile) => {
     const matchesSearch = !searchQuery.value || tile.name.toLowerCase().includes(searchQuery.value.toLowerCase())
     const matchesTags = selectedTags.value.length === 0 || (tile.tags && selectedTags.value.some((tag) => tile.tags.includes(tag)))
     return matchesSearch && matchesTags
   })
 
   filteredTiles.forEach((tile) => {
-    const parentGroup = groups.find((group) => areTilesRelated(group.parent, tile))
+    const parentGroup = groups.find((group) => tileProcessor.areTilesRelated(group.parent, tile))
     if (parentGroup && parentGroup.parent.id !== tile.id) {
       parentGroup.children.push(tile)
     } else {
@@ -121,32 +133,6 @@ const groupedTiles = computed(() => {
   return groups
 })
 
-const tileColorData = ref<Map<string, { r: number; g: number; b: number }>>(new Map())
-const tileEdgeData = ref<Map<string, number>>(new Map())
-
-function areTilesRelated(tile1: Tile, tile2: Tile): boolean {
-  const colorSimilarityThreshold = 30 // Adjust this value as needed
-  const edgeComplexitySimilarityThreshold = 20 // Adjust this value as needed
-
-  const color1 = tileColorData.value.get(tile1.id)
-  const color2 = tileColorData.value.get(tile2.id)
-  const edge1 = tileEdgeData.value.get(tile1.id)
-  const edge2 = tileEdgeData.value.get(tile2.id)
-
-  if (!color1 || !color2 || edge1 === undefined || edge2 === undefined) {
-    return false
-  }
-
-  const colorDifference = Math.sqrt(Math.pow(color1.r - color2.r, 2) + Math.pow(color1.g - color2.g, 2) + Math.pow(color1.b - color2.b, 2))
-
-  const edgeComplexityDifference = Math.abs(edge1 - edge2)
-
-  const namePrefix1 = tile1.name.split('_')[0]
-  const namePrefix2 = tile2.name.split('_')[0]
-
-  return colorDifference <= colorSimilarityThreshold && edgeComplexityDifference <= edgeComplexitySimilarityThreshold && namePrefix1 === namePrefix2
-}
-
 const toggleTag = (tag: string) => {
   if (selectedTags.value.includes(tag)) {
     selectedTags.value = selectedTags.value.filter((t) => t !== tag)
@@ -155,57 +141,6 @@ const toggleTag = (tag: string) => {
   }
 }
 
-function processTile(tile: Tile) {
-  const img = new Image()
-  img.crossOrigin = 'Anonymous'
-  img.onload = () => {
-    const canvas = document.createElement('canvas')
-    const ctx = canvas.getContext('2d')
-    canvas.width = img.width
-    canvas.height = img.height
-    ctx!.drawImage(img, 0, 0, img.width, img.height)
-
-    const imageData = ctx!.getImageData(0, 0, canvas.width, canvas.height)
-    tileColorData.value.set(tile.id, getDominantColor(imageData))
-    tileEdgeData.value.set(tile.id, getEdgeComplexity(imageData))
-  }
-  img.src = `${config.server_endpoint}/textures/tiles/${tile.id}.png`
-}
-
-function getDominantColor(imageData: ImageData) {
-  let r = 0,
-    g = 0,
-    b = 0,
-    total = 0
-  for (let i = 0; i < imageData.data.length; i += 4) {
-    if (imageData.data[i + 3] > 0) {
-      // Only consider non-transparent pixels
-      r += imageData.data[i]
-      g += imageData.data[i + 1]
-      b += imageData.data[i + 2]
-      total++
-    }
-  }
-  return {
-    r: Math.round(r / total),
-    g: Math.round(g / total),
-    b: Math.round(b / total)
-  }
-}
-
-function getEdgeComplexity(imageData: ImageData) {
-  let edgePixels = 0
-  for (let y = 0; y < imageData.height; y++) {
-    for (let x = 0; x < imageData.width; x++) {
-      const i = (y * imageData.width + x) * 4
-      if (imageData.data[i + 3] > 0 && (x === 0 || y === 0 || x === imageData.width - 1 || y === imageData.height - 1 || imageData.data[i - 1] === 0 || imageData.data[i + 7] === 0)) {
-        edgePixels++
-      }
-    }
-  }
-  return edgePixels
-}
-
 function getTileCategory(tile: Tile): string {
   return tileCategories.value.get(tile.id) || ''
 }
@@ -219,18 +154,26 @@ function closeGroup() {
 }
 
 function selectTile(tile: string) {
-  mapEditorStore.setSelectedTile(tile)
+  mapEditor.setSelectedTile(tile)
 }
 
 function isActiveTile(tile: Tile): boolean {
-  return mapEditorStore.selectedTile === tile.id
+  return mapEditor.selectedTile.value === tile.id
 }
 
 onMounted(async () => {
-  isModalOpen.value = true
-  gameStore.connection?.emit('gm:tile:list', {}, (response: Tile[]) => {
-    mapEditorStore.setTileList(response)
-    response.forEach((tile) => processTile(tile))
+  tiles.value = await tileStorage.getAll()
+  const initialBatchSize = 20
+  const initialTiles = tiles.value.slice(0, initialBatchSize)
+  initialTiles.forEach((tile) => tileProcessor.processTile(tile))
+
+  // Process remaining tiles in background
+  setTimeout(() => {
+    tiles.value.slice(initialBatchSize).forEach((tile) => tileProcessor.processTile(tile))
+  }, 1000)
 })
+
+onUnmounted(() => {
+  tileProcessor.cleanup()
 })
 </script>

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

@@ -1,94 +1,99 @@
 <template>
   <div class="flex justify-center p-5">
-    <div class="toolbar fixed bottom-0 left-0 m-3 rounded flex bg-gray solid border-solid border-2 border-gray-500 text-gray-300 p-1.5 px-3 h-10">
-      <div ref="toolbar" class="tools flex gap-2.5" v-if="mapEditorStore.map">
-        <button class="flex justify-center items-center min-w-10 p-0 relative" :class="{ 'border-0 border-b-[3px] border-solid border-cyan gap-2.5': mapEditorStore.tool === 'move' }" @click="handleClick('move')">
-          <img class="invert w-5 h-5" src="/assets/icons/mapEditor/move.svg" alt="Move camera" /> <span class="h-5" :class="{ 'ml-2.5': mapEditorStore.tool !== 'move' }">(M)</span>
+    <div class="toolbar fixed bottom-0 left-0 m-3 rounded flex bg-gray solid border-solid border-2 border-gray-500 text-gray-300 p-1.5 px-3 h-10 z-20">
+      <div ref="toolbar" class="tools flex gap-2.5" v-if="mapEditor.currentMap.value">
+        <button class="flex justify-center items-center min-w-10 p-0 relative" :class="{ 'border-0 border-b-[3px] border-solid border-cyan gap-2.5': mapEditor.tool.value === 'move' }" @click="handleClick('move')">
+          <img class="invert w-5 h-5" src="/assets/icons/mapEditor/move.svg" alt="Move camera" /> <span class="h-5" :class="{ 'ml-2.5': mapEditor.tool.value !== 'move' }">(M)</span>
         </button>
 
         <div class="w-px bg-cyan"></div>
 
-        <button class="flex justify-center items-center min-w-10 p-0 relative" :class="{ 'border-0 border-b-[3px] border-solid border-cyan gap-2.5': mapEditorStore.tool === 'pencil' }" @click="handleClick('pencil')">
-          <img class="invert w-5 h-5" src="/assets/icons/mapEditor/pencil.svg" alt="Pencil" /> <span class="h-5" :class="{ 'ml-2.5': mapEditorStore.tool !== 'pencil' }">(P)</span>
-          <div class="select" v-if="mapEditorStore.tool === 'pencil'">
+        <button class="flex justify-center items-center min-w-10 p-0 relative" :class="{ 'border-0 border-b-[3px] border-solid border-cyan gap-2.5': mapEditor.tool.value === 'pencil' }" @click="handleClick('pencil')">
+          <img class="invert w-5 h-5" src="/assets/icons/mapEditor/pencil.svg" alt="Pencil" /> <span class="h-5" :class="{ 'ml-2.5': mapEditor.tool.value !== 'pencil' }">(P)</span>
+          <div class="select" v-if="mapEditor.tool.value === 'pencil'">
             <div class="select-trigger group capitalize flex gap-3.5" :class="{ open: selectPencilOpen }">
-              {{ mapEditorStore.drawMode.replace('_', ' ') }}
+              {{ mapEditor.drawMode.value.replace('_', ' ') }}
               <img class="group-[.open]:rotate-180 invert w-5 h-5 rotate-0 transition ease-in-out duration-200" src="/assets/icons/mapEditor/chevron.svg" alt="" />
             </div>
-            <div class="flex flex-col absolute bottom-full mb-5 left-1/2 -translate-x-1/2 bg-gray rounded min-w-28 border border-gray-500 border-solid text-left" v-show="selectPencilOpen && mapEditorStore.tool === 'pencil'">
-              <span class="py-2 px-2.5 relative hover:bg-cyan hover:text-white" @click="setDrawMode('tile')">
+            <div class="flex flex-col absolute bottom-full mb-5 left-1/2 -translate-x-1/2 bg-gray rounded min-w-28 border border-gray-500 border-solid text-left" v-show="selectPencilOpen && mapEditor.tool.value === 'pencil'">
+              <span class="py-2 px-2.5 relative hover:bg-cyan hover:text-white" @click="() => handleModeClick('tile', 'pencil')">
                 Tile
                 <div class="absolute w-4/5 left-1/2 -translate-x-1/2 bottom-0 h-px bg-cyan"></div>
               </span>
-              <span class="py-2 px-2.5 relative hover:bg-cyan hover:text-white" @click="setDrawMode('map_object')">
+              <span class="py-2 px-2.5 relative hover:bg-cyan hover:text-white" @click="() => handleModeClick('map_object', 'pencil')">
                 Map object
                 <div class="absolute w-4/5 left-1/2 -translate-x-1/2 bottom-0 h-px bg-cyan"></div>
               </span>
-              <span class="py-2 px-2.5 relative hover:bg-cyan hover:text-white" @click="setDrawMode('teleport')">
+              <span class="py-2 px-2.5 relative hover:bg-cyan hover:text-white" @click="() => handleModeClick('teleport', 'pencil')">
                 Teleport
                 <div class="absolute w-4/5 left-1/2 -translate-x-1/2 bottom-0 h-px bg-cyan"></div>
               </span>
-              <span class="py-2 px-2.5 relative hover:bg-cyan hover:text-white" @click="setDrawMode('blocking tile')">Blocking tile</span>
+              <span class="py-2 px-2.5 relative hover:bg-cyan hover:text-white" @click="() => handleModeClick('blocking tile', 'pencil')">Blocking tile</span>
             </div>
           </div>
         </button>
 
         <div class="w-px bg-cyan"></div>
 
-        <button class="flex justify-center items-center min-w-10 p-0 relative" :class="{ 'border-0 border-b-[3px] border-solid border-cyan gap-2.5': mapEditorStore.tool === 'eraser' }" @click="handleClick('eraser')">
-          <img class="invert w-5 h-5" src="/assets/icons/mapEditor/eraser.svg" alt="Eraser" /> <span class="h-5" :class="{ 'ml-2.5': mapEditorStore.tool !== 'eraser' }">(E)</span>
-          <div class="select" v-if="mapEditorStore.tool === 'eraser'">
+        <button class="flex justify-center items-center min-w-10 p-0 relative" :class="{ 'border-0 border-b-[3px] border-solid border-cyan gap-2.5': mapEditor.tool.value === 'eraser' }" @click="handleClick('eraser')">
+          <img class="invert w-5 h-5" src="/assets/icons/mapEditor/eraser.svg" alt="Eraser" /> <span class="h-5" :class="{ 'ml-2.5': mapEditor.tool.value !== 'eraser' }">(E)</span>
+          <div class="select" v-if="mapEditor.tool.value === 'eraser'">
             <div class="select-trigger group capitalize flex gap-3.5" :class="{ open: selectEraserOpen }">
-              {{ mapEditorStore.eraserMode.replace('_', ' ') }}
-              <img class="group-[.open]:rotate-180 invert w-5 h-5 rotate-0 transition ease-in-out duration-200" src="/assets/icons/mapEditor/chevron.svg" />
+              {{ mapEditor.drawMode.value.replace('_', ' ') }}
+              <img class="group-[.open]:rotate-180 invert w-5 h-5 rotate-0 transition ease-in-out duration-200" src="/assets/icons/mapEditor/chevron.svg" alt="" />
             </div>
             <div class="flex flex-col absolute bottom-full mb-5 left-1/2 -translate-x-1/2 bg-gray rounded min-w-28 border border-gray-500 border-solid text-left" v-show="selectEraserOpen">
-              <span class="py-2 px-2.5 relative hover:bg-cyan hover:text-white" @click="setEraserMode('tile')">
+              <span class="py-2 px-2.5 relative hover:bg-cyan hover:text-white" @click="() => handleModeClick('tile', 'eraser')">
                 Tile
                 <div class="absolute w-4/5 left-1/2 -translate-x-1/2 bottom-0 h-px bg-cyan"></div>
               </span>
-              <span class="py-2 px-2.5 relative hover:bg-cyan hover:text-white" @click="setEraserMode('map_object')">
+              <span class="py-2 px-2.5 relative hover:bg-cyan hover:text-white" @click="() => handleModeClick('map_object', 'eraser')">
                 Map object
                 <div class="absolute w-4/5 left-1/2 -translate-x-1/2 bottom-0 h-px bg-cyan"></div>
               </span>
-              <span class="py-2 px-2.5 relative hover:bg-cyan hover:text-white" @click="setEraserMode('teleport')">
+              <span class="py-2 px-2.5 relative hover:bg-cyan hover:text-white" @click="() => handleModeClick('teleport', 'eraser')">
                 Teleport
                 <div class="absolute w-4/5 left-1/2 -translate-x-1/2 bottom-0 h-px bg-cyan"></div>
               </span>
-              <span class="py-2 px-2.5 relative hover:bg-cyan hover:text-white" @click="setEraserMode('blocking tile')">Blocking tile</span>
+              <span class="py-2 px-2.5 relative hover:bg-cyan hover:text-white" @click="() => handleModeClick('blocking tile', 'eraser')">Blocking tile</span>
             </div>
           </div>
         </button>
 
         <div class="w-px bg-cyan"></div>
 
-        <button class="flex justify-center items-center min-w-10 p-0 relative" :class="{ 'border-0 border-b-[3px] border-solid border-cyan gap-2.5': mapEditorStore.tool === 'paint' }" @click="handleClick('paint')">
-          <img class="invert w-5 h-5" src="/assets/icons/mapEditor/paint.svg" alt="Paint bucket" /> <span class="h-5" :class="{ 'ml-2.5': mapEditorStore.tool !== 'paint' }">(B)</span>
+        <button class="flex justify-center items-center min-w-10 p-0 relative" :class="{ 'border-0 border-b-[3px] border-solid border-cyan gap-2.5': mapEditor.tool.value === 'paint' }" @click="handleClick('paint')">
+          <img class="invert w-5 h-5" src="/assets/icons/mapEditor/paint.svg" alt="Paint bucket" /> <span class="h-5" :class="{ 'ml-2.5': mapEditor.tool.value !== 'paint' }">(B)</span>
         </button>
 
         <div class="w-px bg-cyan"></div>
 
-        <button class="flex justify-center items-center min-w-10 p-0 relative" @click="handleClick('settings')" v-if="mapEditorStore.map"><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>
+
+        <label class="my-auto gap-0" for="checkbox">Continuous Drawing</label>
+        <input type="checkbox" />
       </div>
 
       <div class="toolbar fixed bottom-0 right-0 m-3 rounded flex bg-gray solid border-solid border-2 border-gray-500 text-gray-300 p-1.5 px-3 h-10 space-x-2">
-        <button class="btn-cyan px-3.5" @click="() => mapEditorStore.toggleMapListModal()">Load</button>
-        <button class="btn-cyan px-3.5" @click="() => emit('save')" v-if="mapEditorStore.map">Save</button>
-        <button class="btn-cyan px-3.5" @click="() => emit('clear')" v-if="mapEditorStore.map">Clear</button>
-        <button class="btn-cyan px-3.5" @click="() => mapEditorStore.toggleActive()">Exit</button>
+        <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="() => emit('close-editor')">Exit</button>
       </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { useMapEditorStore } from '@/stores/mapEditorStore'
+import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
 import { onClickOutside } from '@vueuse/core'
 import { onBeforeUnmount, onMounted, ref } from 'vue'
 
-const mapEditorStore = useMapEditorStore()
+const mapEditor = useMapEditorComposable()
 
-const emit = defineEmits(['save', 'clear'])
+const emit = defineEmits(['save', 'clear', 'open-maps', 'open-settings', 'close-editor', 'open-tile-list', 'open-map-object-list', 'close-lists'])
 
 // track when clicked outside of toolbar items
 const toolbar = ref(null)
@@ -97,26 +102,49 @@ const toolbar = ref(null)
 let selectPencilOpen = ref(false)
 let selectEraserOpen = ref(false)
 
+let tileListShown = ref(false)
+let mapObjectListShown = ref(false)
+
+defineExpose({ tileListShown, mapObjectListShown })
+
 // drawMode
 function setDrawMode(value: string) {
-  mapEditorStore.isTileListModalShown = value === 'tile'
-  mapEditorStore.isMapObjectListModalShown = value === 'map_object'
+  if (mapEditor.tool.value === 'paint' || mapEditor.tool.value === 'pencil' || mapEditor.tool.value === 'eraser') {
+    emit('close-lists')
+    if (value === 'tile') emit('open-tile-list')
+    if (value === 'map_object') emit('open-map-object-list')
+  }
 
-  mapEditorStore.setDrawMode(value)
+  mapEditor.setDrawMode(value)
+  selectPencilOpen.value = false
+  selectEraserOpen.value = false
+}
+
+function setPencilMode() {
+  mapEditor.setTool('pencil')
   selectPencilOpen.value = false
 }
 
 // drawMode
-function setEraserMode(value: string) {
-  mapEditorStore.setEraserMode(value)
+function setEraserMode() {
+  mapEditor.setTool('eraser')
   selectEraserOpen.value = false
 }
 
+function handleModeClick(mode: string, type: 'pencil' | 'eraser') {
+  setDrawMode(mode)
+  type === 'pencil' ? setPencilMode() : setEraserMode()
+}
+
 function handleClick(tool: string) {
   if (tool === 'settings') {
-    mapEditorStore.toggleSettingsModal()
+    emit('open-settings')
+    emit('close-lists')
+  } else if (tool === 'move') {
+    emit('close-lists')
+    mapEditor.setTool(tool)
   } else {
-    mapEditorStore.setTool(tool)
+    mapEditor.setTool(tool)
   }
 
   selectPencilOpen.value = tool === 'pencil' ? !selectPencilOpen.value : false
@@ -124,22 +152,17 @@ function handleClick(tool: string) {
 }
 
 function cycleToolMode(tool: 'pencil' | 'eraser') {
-  const modes = ['tile', 'object', 'teleport', 'blocking tile']
-  const currentMode = tool === 'pencil' ? mapEditorStore.drawMode : mapEditorStore.eraserMode
-  const currentIndex = modes.indexOf(currentMode)
+  const modes = ['tile', 'map_object', 'teleport', 'blocking tile']
+  const currentIndex = modes.indexOf(mapEditor.drawMode.value)
   const nextIndex = (currentIndex + 1) % modes.length
   const nextMode = modes[nextIndex]
 
-  if (tool === 'pencil') {
   setDrawMode(nextMode)
-  } else {
-    setEraserMode(nextMode)
-  }
 }
 
 function initKeyShortcuts(event: KeyboardEvent) {
   // Check if map is set
-  if (!mapEditorStore.map) return
+  if (!mapEditor.currentMap.value) return
 
   // prevent if focused on composables
   if (document.activeElement?.tagName === 'INPUT') return
@@ -154,7 +177,7 @@ function initKeyShortcuts(event: KeyboardEvent) {
 
   if (keyActions.hasOwnProperty(event.key)) {
     const tool = keyActions[event.key]
-    if ((tool === 'pencil' || tool === 'eraser') && mapEditorStore.tool === tool) {
+    if ((tool === 'pencil' || tool === 'eraser') && mapEditor.tool.value === tool) {
       cycleToolMode(tool)
     } else {
       handleClick(tool)

src/components/gui/UserPanel.vue

@@ -1,42 +0,0 @@
-<template>
-  <div class="absolute z-50 w-full h-dvh top-0 left-0 bg-black/60" v-show="false">
-    <div class="center-element max-w-[875px] max-h-[600px] h-full w-[80%] bg-gray border-solid border-2 border-gray-500 rounded-md z-50 flex flex-col backdrop-blur-sm shadow-lg">
-      <div class="p-2.5 flex max-sm:flex-wrap justify-between items-center gap-5 border-solid border-0 border-b border-gray-500">
-        <h3 class="m-0 font-medium shrink-0">Game menu</h3>
-        <div class="hidden sm:flex gap-1.5 flex-wrap">
-          <button @click.stop="userPanelScreen = 'inventory'" :class="{ active: userPanelScreen === 'inventory' }" class="btn-cyan py-1.5 px-4 min-w-24">Inventory</button>
-          <button @click.stop="userPanelScreen = 'equipment'" :class="{ active: userPanelScreen === 'equipment' }" class="btn-cyan py-1.5 px-4 min-w-24">Equipment</button>
-          <button @click.stop="userPanelScreen = 'characterScreen'" :class="{ active: userPanelScreen === 'characterScreen' }" class="btn-cyan py-1.5 px-4 min-w-24">Character</button>
-          <button @click.stop="userPanelScreen = 'settings'" :class="{ active: userPanelScreen === 'settings' }" class="btn-cyan py-1.5 px-4 min-w-24">Settings</button>
-        </div>
-        <div class="flex gap-2.5">
-          <button class="w-3.5 h-3.5 m-0 p-0 relative hover:rotate-180 transition-transform duration-300 ease-in-out">
-            <img alt="close" draggable="false" src="/assets/icons/modal/close-button-white.svg" class="w-full h-full" />
-          </button>
-        </div>
-        <div class="flex sm:hidden gap-1.5 flex-wrap">
-          <button @click.stop="userPanelScreen = 'inventory'" :class="{ active: userPanelScreen === 'inventory' }" class="btn-cyan py-1.5 px-4 min-w-24">Inventory</button>
-          <button @click.stop="userPanelScreen = 'equipment'" :class="{ active: userPanelScreen === 'equipment' }" class="btn-cyan py-1.5 px-4 min-w-24">Equipment</button>
-          <button @click.stop="userPanelScreen = 'characterScreen'" :class="{ active: userPanelScreen === 'characterScreen' }" class="btn-cyan py-1.5 px-4 min-w-24">Character</button>
-          <button @click.stop="userPanelScreen = 'settings'" :class="{ active: userPanelScreen === 'settings' }" class="btn-cyan py-1.5 px-4 min-w-24">Settings</button>
-        </div>
-      </div>
-      <Inventory v-show="userPanelScreen === 'inventory'" />
-      <Equipment v-show="userPanelScreen === 'equipment'" />
-      <CharacterScreen v-show="userPanelScreen === 'characterScreen'" />
-      <Settings v-show="userPanelScreen === 'settings'" />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import CharacterScreen from '@/components/gui/partials/CharacterScreen.vue'
-import Equipment from '@/components/gui/partials/Equipment.vue'
-import Inventory from '@/components/gui/partials/Inventory.vue'
-import Settings from '@/components/gui/partials/Settings.vue'
-import { useGameStore } from '@/stores/gameStore'
-import { ref } from 'vue'
-
-const gameStore = useGameStore()
-let userPanelScreen = ref('inventory')
-</script>

src/components/gui/partials/CharacterScreen.vue

@@ -1,68 +0,0 @@
-<template>
-  <div class="grow flex flex-col w-full h-full relative overflow-auto">
-    <div class="m-4 relative">
-      <h4 class="font-medium text-lg max-w-[375px]">Character</h4>
-      <div class="flex justify-center flex-wrap gap-20">
-        <div class="flex gap-3 mt-2 flex-wrap max-w-[375px]">
-          <div class="h-full flex flex-col justify-center items-center">
-            <img class="h-72 my-2 mx-auto" src="/assets/placeholders/inventory_player.png" />
-          </div>
-        </div>
-        <div class="flex flex-col gap-4">
-          <div class="flex flex-col gap-3 mx-5 mt-2">
-            <h3>{{ gameStore.character?.name }}</h3>
-            <div class="flex gap-4 flex-wrap max-w-[375px]">
-              <ul class="p-0 m-0 list-none">
-                <li class="leading-6 text-lg">Class:</li>
-                <li class="leading-6 text-lg">Race:</li>
-                <li class="leading-6 text-lg">Hit Points:</li>
-                <li class="leading-6 text-lg">Mana Points:</li>
-                <li class="leading-6 text-lg">Level:</li>
-                <li class="leading-6 text-lg">Stat Points:</li>
-              </ul>
-              <ul class="p-0 m-0 list-none">
-                <li class="leading-6 text-lg min-h-6">Knight</li>
-                <li class="leading-6 text-lg min-h-6">{{ gameStore.character?.characterType?.race }}</li>
-                <li class="leading-6 text-lg min-h-6">{{ gameStore.character?.hitpoints }} <span class="text-green">(+15)</span></li>
-                <li class="leading-6 text-lg min-h-6">{{ gameStore.character?.mana }}</li>
-                <li class="leading-6 text-lg min-h-6">{{ gameStore.character?.level }}</li>
-                <li class="leading-6 text-lg min-h-6">3</li>
-              </ul>
-            </div>
-          </div>
-          <div class="flex flex-col gap-3 mx-5 mt-2">
-            <h3>Alignment</h3>
-            <div class="h-8 w-64 rounded border border-solid border-white bg-gradient-to-r from-red to-blue relative">
-              <!-- TODO: Give slider left value based on alignment (0-100), new characters start with 50 -->
-              <div class="rounded border-2 border-solid border-white h-10 w-2 absolute top-1/2 -translate-y-1/2 -translate-x-1/2" :style="{ left: gameStore.character?.alignment + '%' }"></div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="absolute -left-5 -bottom-5 w-[calc(100%_+_40px)] my-px h-px bg-gray-500"></div>
-    </div>
-    <div class="m-4">
-      <h4 class="font-medium text-lg max-w-[375px]">Character stats</h4>
-      <div class="flex gap-3 mt-4 flex-wrap max-w-[375px]">
-        <ul class="p-0 m-0 list-none">
-          <li class="leading-6">Health:</li>
-          <li class="leading-6">Defense:</li>
-          <li class="leading-6">More stats:</li>
-          <li class="leading-6">Extra stats:</li>
-        </ul>
-        <ul class="p-0 m-0 list-none text-right">
-          <li class="leading-6">100 <span class="text-green">(+15)</span></li>
-          <li class="leading-6">1000 <span class="text-green">(+500)</span></li>
-          <li class="leading-6"></li>
-          <li class="leading-6"></li>
-        </ul>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { useGameStore } from '@/stores/gameStore'
-
-const gameStore = useGameStore()
-</script>

src/components/gui/partials/Equipment.vue

@@ -1,89 +0,0 @@
-<template>
-  <div class="grow flex flex-col w-full h-full relative overflow-auto">
-    <div class="m-4 relative">
-      <h4 class="font-medium text-lg max-w-[375px]">Equipment</h4>
-      <div class="flex justify-center items-center flex-wrap gap-20">
-        <div class="flex gap-3 mt-2 flex-wrap max-w-[375px]">
-          <div class="h-full flex flex-col justify-center items-center">
-            <h3>{{ gameStore.character?.name }}</h3>
-            <img class="h-60 my-2 mx-auto" src="/assets/placeholders/inventory_player.png" />
-            <span class="block text-sm">Level {{ gameStore.character?.level }}</span>
-          </div>
-        </div>
-        <div class="flex flex-col gap-3 mx-5 mt-2">
-          <div class="flex gap-3 justify-center">
-            <!-- Helmet -->
-            <div class="bg-gray-300/80 border-solid border-2 border-gray-500 rounded-md aspect-square h-11 w-11 relative hover:bg-gray-200">
-              <img src="/assets/icons/inventory/helmet.svg" class="center-element w-11/12 opacity-20" />
-            </div>
-
-            <!-- Head charm -->
-            <div class="bg-gray-300/80 border-solid border-2 border-gray-500 rounded-md aspect-square h-11 w-11 relative hover:bg-gray-200">
-              <img src="/assets/icons/inventory/head_charm.svg" class="center-element w-11/12 opacity-20" />
-            </div>
-          </div>
-
-          <div class="flex gap-3 justify-center">
-            <!-- Bracers -->
-            <div class="bg-gray-300/80 border-solid border-2 border-gray-500 rounded-md w-11 h-[104px] relative hover:bg-gray-200">
-              <img src="/assets/icons/inventory/bracers.svg" class="center-element w-11/12 opacity-20" />
-            </div>
-
-            <!-- Chestplate -->
-            <div class="bg-gray-300/80 border-solid border-2 border-gray-500 rounded-md aspect-square w-[104px] h-[104px] relative hover:bg-gray-200">
-              <img src="/assets/icons/inventory/chestplate.svg" class="center-element w-10/12 opacity-20" />
-            </div>
-
-            <!-- Primary Weapon -->
-            <div class="bg-gray-300/80 border-solid border-2 border-gray-500 rounded-md w-11 h-[104px] self-stretch justify-self-stretch relative hover:bg-gray-200">
-              <img src="/assets/icons/inventory/primary_weapon.svg" class="center-element w-11/12 opacity-20" />
-            </div>
-          </div>
-
-          <div class="flex gap-3 justify-center">
-            <!-- Legs -->
-            <div class="bg-gray-300/80 border-solid border-2 border-gray-500 rounded-md w-11 h-[104px] self-stretch justify-self-stretch relative hover:bg-gray-200">
-              <img src="/assets/icons/inventory/legs.svg" class="center-element w-11/12 opacity-20" />
-            </div>
-
-            <div class="flex flex-col gap-3">
-              <!-- Belt/pouch -->
-              <div class="bg-gray-300/80 border-solid border-2 border-gray-500 rounded-md aspect-square h-11 w-11 self-stretch justify-self-stretch relative hover:bg-gray-200">
-                <img src="/assets/icons/inventory/pouch.svg" class="center-element w-11/12 opacity-20" />
-              </div>
-
-              <!-- Boots -->
-              <div class="bg-gray-300/80 border-solid border-2 border-gray-500 rounded-md aspect-square h-11 w-11 self-stretch justify-self-stretch relative hover:bg-gray-200">
-                <img src="/assets/icons/inventory/boots.svg" class="center-element w-11/12 opacity-20" />
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="absolute -left-5 -bottom-5 w-[calc(100%_+_40px)] my-px h-px bg-gray-500"></div>
-    </div>
-    <div class="m-4">
-      <h4 class="font-medium text-lg max-w-[375px]">Equipment Bonus</h4>
-      <div class="flex gap-3 mt-4 flex-wrap max-w-[375px]">
-        <ul class="p-0 m-0 list-none">
-          <li class="leading-6">Health:</li>
-          <li class="leading-6">Defense:</li>
-          <li class="leading-6">More stats:</li>
-          <li class="leading-6">Extra stats:</li>
-        </ul>
-        <ul class="p-0 m-0 list-none text-right">
-          <li class="leading-6">+15</li>
-          <li class="leading-6">500</li>
-          <li class="leading-6"></li>
-          <li class="leading-6"></li>
-        </ul>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { useGameStore } from '@/stores/gameStore'
-
-const gameStore = useGameStore()
-</script>

src/components/gui/partials/Inventory.vue

@@ -1,17 +0,0 @@
-<template>
-  <div class="grow flex flex-col w-full h-full relative overflow-auto">
-    <div class="m-4 relative">
-      <h4 class="m-auto font-medium text-lg max-w-[375px]">Inventory</h4>
-      <div class="flex gap-3 mt-4 mx-auto flex-wrap max-w-[375px]">
-        <div v-for="n in 24" class="bg-gray-300/80 border-solid border-2 border-gray-500 w-12 h-12 rounded-md aspect-square shrink-0 justify-self-stretch hover:bg-gray-200"></div>
-      </div>
-      <div class="absolute -left-5 -bottom-5 w-[calc(100%_+_40px)] my-px h-px bg-gray-500"></div>
-    </div>
-    <div class="m-4">
-      <h4 class="m-auto font-medium text-lg max-w-[375px]">Chest items</h4>
-      <div class="flex gap-3 mt-4 mx-auto flex-wrap max-w-[375px]">
-        <div v-for="n in 12" class="bg-gray-300/80 border-solid border-2 border-gray-500 w-12 h-12 rounded-md aspect-square shrink-0 justify-self-stretch hover:bg-gray-200"></div>
-      </div>
-    </div>
-  </div>
-</template>

src/components/gui/partials/Settings.vue

@@ -1,40 +0,0 @@
-<template>
-  <div class="flex h-full w-full relative">
-    <div class="w-2/12 flex flex-col relative">
-      <!-- Settings Categories -->
-      <div class="relative p-2.5">
-        <h3>Settings</h3>
-        <div class="absolute left-0 bottom-0 w-full h-px bg-gray-500"></div>
-      </div>
-      <a class="relative p-2.5 hover:cursor-pointer" :class="{ 'bg-cyan/80': settingCategory === 'character' }" @click.stop="settingCategory = 'character'">
-        <span>Character</span>
-        <div class="absolute left-0 bottom-0 w-full h-px bg-gray-500"></div>
-      </a>
-      <a class="relative p-2.5 hover:cursor-pointer" :class="{ 'bg-cyan/80': settingCategory === 'account' }" @click.stop="settingCategory = 'account'">
-        <span>Account</span>
-        <div class="absolute left-0 bottom-0 w-full h-px bg-gray-500"></div>
-      </a>
-      <a class="relative p-2.5 hover:cursor-pointer" :class="{ 'bg-cyan/80': settingCategory === 'audio' }" @click.stop="settingCategory = 'audio'">
-        <span>Audio</span>
-        <div class="absolute left-0 bottom-0 w-full h-px bg-gray-500"></div>
-      </a>
-      <a class="relative p-2.5 hover:cursor-pointer" :class="{ 'bg-cyan/80': settingCategory === 'video' }" @click.stop="settingCategory = 'video'">
-        <span>Video</span>
-        <div class="absolute left-0 bottom-0 w-full h-px bg-gray-500"></div>
-      </a>
-    </div>
-    <div class="absolute w-px bg-gray-500 h-full top-0 left-1/6"></div>
-
-    <!-- Assets list -->
-    <div class="overflow-auto h-full w-10/12 flex flex-col relative">
-      <CharacterSettings v-show="settingCategory == 'character'" />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import CharacterSettings from '@/components/gui/partials/settings/CharacterSettings.vue'
-import { ref } from 'vue'
-
-let settingCategory = ref('character')
-</script>

src/components/gui/partials/settings/CharacterSettings.vue

@@ -1,34 +0,0 @@
-<template>
-  <div class="h-full overflow-auto">
-    <div class="relative p-2.5 flex flex-col gap-5 h-72">
-      <h3>Character details</h3>
-      <button @click="toggle" class="btn-cyan px-4 py-1.5 w-24">Edit</button>
-      <form class="flex gap-2.5 flex-wrap">
-        <div class="form-field-half max-w-[300px]">
-          <label for="name">Name</label>
-          <input class="input-field" :class="{ inactive: !editCharacter }" type="text" name="name" placeholder="Ethereal" :disabled="!editCharacter" />
-        </div>
-        <div class="form-field-half max-w-[300px] relative">
-          <label for="class">Class</label>
-          <select class="input-field" v-model="characterClass" :class="{ inactive: !editCharacter }" name="class" :disabled="!editCharacter">
-            <option value="Knight" :selected="characterClass == 'Knight'" :disabled="characterClass == 'Knight'">Knight</option>
-            <option value="Paladin" :selected="characterClass == 'Paladin'" :disabled="characterClass == 'Paladin'">Paladin</option>
-          </select>
-          <span v-if="!editCharacter" class="absolute bottom-[9px] left-[14px] text-sm text-gray-300/50">{{ characterClass }}</span>
-        </div>
-        <button v-if="editCharacter" @click="toggle" class="btn-cyan px-4 py-1.5 min-w-24" type="submit">Save</button>
-      </form>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref } from 'vue'
-
-const editCharacter = ref(false)
-const characterClass = ref('')
-
-const toggle = () => {
-  editCharacter.value = !editCharacter.value
-}
-</script>

src/components/screens/Characters.vue

@@ -34,7 +34,7 @@
                     <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" alt="Player avatar" :src="config.server_endpoint + '/avatar/s/' + characters.find((c) => c.id === selectedCharacterId)?.characterType + '/' + (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>
@@ -87,7 +87,7 @@
         </div>
       </div>
       <div v-else>
-        <img class="w-20 invert-80" src="/assets/icons/loading-icon1.svg" />
+        <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">
@@ -131,11 +131,11 @@ import { onBeforeUnmount, onMounted, ref, watch } from 'vue'
 const gameStore = useGameStore()
 const isLoading = ref<boolean>(true)
 const characters = ref<CharacterT[]>([])
-const selectedCharacterId = ref<number | null>(null)
+const selectedCharacterId = ref<string | null>(null)
 const isCreateNewCharacterModalOpen = ref<boolean>(false)
 const newCharacterName = ref<string>('')
 const characterHairs = ref<CharacterHair[]>([])
-const selectedHairId = ref<number | null>(null)
+const selectedHairId = ref<string | null>(null)
 
 // Fetch characters
 setTimeout(() => {

src/components/screens/Game.vue

@@ -11,7 +11,6 @@
         <ExpBar />
 
         <CharacterProfile />
-        <Effects />
       </Scene>
     </Game>
   </div>
@@ -20,18 +19,15 @@
 <script setup lang="ts">
 import config from '@/application/config'
 import 'phaser'
-import Effects from '@/components/Effects.vue'
+import CharacterProfile from '@/components/game/gui/CharacterProfile.vue'
+import Chat from '@/components/game/gui/Chat.vue'
+import Clock from '@/components/game/gui/Clock.vue'
+import ExpBar from '@/components/game/gui/ExpBar.vue'
+import Hotkeys from '@/components/game/gui/Hotkeys.vue'
+import Hud from '@/components/game/gui/Hud.vue'
+import Menu from '@/components/game/gui/Menu.vue'
 import Map from '@/components/game/map/Map.vue'
-import CharacterProfile from '@/components/gui/CharacterProfile.vue'
-import Chat from '@/components/gui/Chat.vue'
-// import Minimap from '@/components/gui/Minimap.vue'
-import Clock from '@/components/gui/Clock.vue'
-import ExpBar from '@/components/gui/ExpBar.vue'
-import Hotkeys from '@/components/gui/Hotkeys.vue'
-import Hud from '@/components/gui/Hud.vue'
-import Menu from '@/components/gui/Menu.vue'
 import { useGameStore } from '@/stores/gameStore'
-import AwaitLoaderPlugin from 'phaser3-rex-plugins/plugins/awaitloader-plugin'
 import { Game, Scene } from 'phavuer'
 import { onBeforeUnmount } from 'vue'
 
@@ -42,22 +38,11 @@ const gameConfig = {
   width: window.innerWidth,
   height: window.innerHeight,
   type: Phaser.AUTO, // AUTO, CANVAS, WEBGL, HEADLESS
-  resolution: 5,
-  plugins: {
-    global: [
-      {
-        key: 'rexAwaitLoader',
-        plugin: AwaitLoaderPlugin,
-        start: true
-      }
-    ]
-  }
+  resolution: 5
 }
 
 const createGame = (game: Phaser.Game) => {
-  /**
-   * Resize the game when the window is resized
-   */
+  // Resize the game when the window is resized
   addEventListener('resize', () => {
     game.scale.resize(window.innerWidth, window.innerHeight)
   })
@@ -73,9 +58,7 @@ const createGame = (game: Phaser.Game) => {
 }
 
 function preloadScene(scene: Phaser.Scene) {
-  /**
-   * Load the base assets into the Phaser scene
-   */
+  // Load the base assets into the Phaser scene
   scene.load.image('blank_tile', '/assets/map/blank_tile.png')
   scene.load.image('waypoint', '/assets/waypoint.png')
 }

src/components/screens/Loading.vue

@@ -1,25 +1,12 @@
 <template>
   <div class="flex flex-col justify-center items-center h-dvh relative col">
-    <svg width="40" height="40" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-      <circle cx="4" cy="12" r="3" fill="white">
-        <animate id="spinner_qFRN" begin="0;spinner_OcgL.end+0.25s" attributeName="cy" calcMode="spline" dur="0.6s" values="12;6;12" keySplines=".33,.66,.66,1;.33,0,.66,.33" />
-      </circle>
-      <circle cx="12" cy="12" r="3" fill="white">
-        <animate begin="spinner_qFRN.begin+0.1s" attributeName="cy" calcMode="spline" dur="0.6s" values="12;6;12" keySplines=".33,.66,.66,1;.33,0,.66,.33" />
-      </circle>
-      <circle cx="20" cy="12" r="3" fill="white">
-        <animate id="spinner_OcgL" begin="spinner_qFRN.begin+0.2s" attributeName="cy" calcMode="spline" dur="0.6s" values="12;6;12" keySplines=".33,.66,.66,1;.33,0,.66,.33" />
-      </circle>
-    </svg>
+    <img class="w-20 invert-80" src="/assets/icons/loading-icon1.svg" alt="Loading" />
   </div>
 </template>
 
 <script setup lang="ts" async>
-import config from '@/application/config'
-import type { HttpResponse, MapObject } from '@/application/types'
-import type { BaseStorage } from '@/storage/baseStorage'
+import { downloadCache } from '@/application/utilities'
 import { CharacterHairStorage, CharacterTypeStorage, MapObjectStorage, MapStorage, SpriteStorage, TileStorage } from '@/storage/storages'
-// import type { Map } from '@/application/types'
 import { useGameStore } from '@/stores/gameStore'
 import { ref } from 'vue'
 
@@ -28,32 +15,13 @@ const gameStore = useGameStore()
 const totalItems = ref(0)
 const currentItem = ref(0)
 
-async function downloadAndStore<T extends { id: string }>(endpoint: string, storage: BaseStorage<T>) {
-  const request = await fetch(`${config.server_endpoint}/cache/${endpoint}`)
-  const response = (await request.json()) as HttpResponse<T[]>
-
-  if (!response.success) {
-    console.error(`Failed to download ${endpoint}:`, response.message)
-    return
-  }
-
-  const items = response.data ?? []
-  for (const item of items) {
-    await storage.add(item)
-  }
-}
-
-const tileStorage = new TileStorage()
-const mapStorage = new MapStorage()
-const mapObjectStorage = new MapObjectStorage()
-
 Promise.all([
-  downloadAndStore('tiles', tileStorage),
-  downloadAndStore('maps', mapStorage),
-  downloadAndStore('map_objects', mapObjectStorage),
-  downloadAndStore('sprites', new SpriteStorage()),
-  downloadAndStore('character_types', new CharacterTypeStorage()),
-  downloadAndStore('character_hair', new CharacterHairStorage())
+  downloadCache('tiles', new TileStorage()),
+  downloadCache('maps', new MapStorage()),
+  downloadCache('map_objects', new MapObjectStorage()),
+  downloadCache('sprites', new SpriteStorage()),
+  downloadCache('character_types', new CharacterTypeStorage()),
+  downloadCache('character_hair', new CharacterHairStorage())
 ]).then(() => {
   gameStore.game.isLoaded = true
 })

src/components/screens/Login.vue

@@ -8,8 +8,8 @@
       <div class="h-dvh flex items-center lg:justify-center flex-col px-8 max-lg:pt-20">
         <!--        <img src="/assets/tlogo.png" class="mb-10 w-52" alt="Noxious logo" />-->
         <div class="relative">
-          <img src="/assets/ui-elements/login-ui-box-outer.svg" class="absolute w-full h-full" alt="UI box outer" />
-          <img src="/assets/ui-elements/login-ui-box-inner.svg" class="absolute left-2 top-2 w-[calc(100%_-_16px)] h-[calc(100%_-_16px)] max-lg:hidden" alt="UI box inner" />
+          <img src="/assets/ui-elements/login-ui-box-outer.svg" class="absolute w-full h-full" alt="" />
+          <img src="/assets/ui-elements/login-ui-box-inner.svg" class="absolute left-2 top-2 w-[calc(100%_-_16px)] h-[calc(100%_-_16px)]" alt="" />
 
           <!-- Login Form -->
           <LoginForm v-if="currentForm === 'login' && !doesUrlHaveToken" @openResetPasswordModal="() => (isPasswordResetFormShown = true)" @switchToRegister="currentForm = 'register'" />

src/components/screens/MapEditor.vue

@@ -1,8 +1,28 @@
 <template>
   <div class="flex justify-center items-center h-dvh relative">
     <Game :config="gameConfig" @create="createGame">
-      <Scene name="main" @preload="preloadScene" @create="createScene">
-        <MapEditor :key="JSON.stringify(`${mapEditorStore.map?.id}_${mapEditorStore.map?.createdAt}_${mapEditorStore.map?.updatedAt ?? ''}`)" />
+      <Scene name="main" @preload="preloadScene">
+        <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 :key="mapEditor.currentMap.value?.id" />
+          <Toolbar
+            ref="toolbar"
+            @save="save"
+            @clear="clear"
+            @open-maps="mapModal?.open"
+            @open-settings="mapSettingsModal?.open"
+            @close-editor="mapEditor.toggleActive"
+            @close-lists="tileList?.close"
+            @closeLists="objectList?.close"
+            @open-tile-list="tileList?.open"
+            @open-map-object-list="objectList?.open"
+          />
+          <MapList ref="mapModal" @open-create-map="mapSettingsModal?.open" />
+          <TileList ref="tileList" />
+          <ObjectList ref="objectList" />
+          <MapSettings ref="mapSettingsModal" />
+          <TeleportModal ref="teleportModal" />
+        </div>
       </Scene>
     </Game>
   </div>
@@ -11,76 +31,93 @@
 <script setup lang="ts">
 import config from '@/application/config'
 import 'phaser'
-import type { TextureData } from '@/application/types'
-import MapEditor from '@/components/gameMaster/mapEditor/MapEditor.vue'
-import { loadTexture } from '@/composables/gameComposable'
+import type { Map as MapT } from '@/application/types'
+import Map from '@/components/gameMaster/mapEditor/Map.vue'
+import MapList from '@/components/gameMaster/mapEditor/partials/MapList.vue'
+import ObjectList from '@/components/gameMaster/mapEditor/partials/MapObjectList.vue'
+import MapSettings from '@/components/gameMaster/mapEditor/partials/MapSettings.vue'
+import TeleportModal from '@/components/gameMaster/mapEditor/partials/TeleportModal.vue'
+import TileList from '@/components/gameMaster/mapEditor/partials/TileList.vue'
+import Toolbar from '@/components/gameMaster/mapEditor/partials/Toolbar.vue'
+import { loadAllTilesIntoScene } from '@/composables/mapComposable'
+import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
+import { MapStorage } from '@/storage/storages'
 import { useGameStore } from '@/stores/gameStore'
-import { useMapEditorStore } from '@/stores/mapEditorStore'
-import AwaitLoaderPlugin from 'phaser3-rex-plugins/plugins/awaitloader-plugin'
 import { Game, Scene } from 'phavuer'
+import { ref, useTemplateRef, watch } from 'vue'
 
+const mapStorage = new MapStorage()
+const mapEditor = useMapEditorComposable()
 const gameStore = useGameStore()
-const mapEditorStore = useMapEditorStore()
+
+const toolbar = useTemplateRef('toolbar')
+const mapModal = useTemplateRef('mapModal')
+const tileList = useTemplateRef('tileList')
+const objectList = useTemplateRef('objectList')
+const mapSettingsModal = useTemplateRef('mapSettingsModal')
+const teleportModal = useTemplateRef('teleportModal')
+
+const isLoaded = ref(false)
 
 const gameConfig = {
   name: config.name,
   width: window.innerWidth,
   height: window.innerHeight,
   type: Phaser.AUTO, // AUTO, CANVAS, WEBGL, HEADLESS
-  resolution: 5,
-  plugins: {
-    global: [
-      {
-        key: 'rexAwaitLoader',
-        plugin: AwaitLoaderPlugin,
-        start: true
-      }
-    ]
-  }
+  resolution: 5
 }
 
 const createGame = (game: Phaser.Game) => {
-  /**
-   * Resize the game when the window is resized
-   */
-  addEventListener('resize', () => {
+  // Resize the game when the window is resized
+  window.addEventListener('resize', () => {
     game.scale.resize(window.innerWidth, window.innerHeight)
   })
-
-  // We don't support canvas mode, only WebGL
-  if (game.renderer.type === Phaser.CANVAS) {
-    gameStore.addNotification({
-      title: 'Warning',
-      message: 'Your browser does not support WebGL. Please use a modern browser like Chrome, Firefox, or Edge.'
-    })
-    gameStore.disconnectSocket()
-  }
 }
 
 const preloadScene = async (scene: Phaser.Scene) => {
-  /**
-   * Load the base assets into the Phaser scene
-   */
+  // Load the base assets into the Phaser scene
   scene.load.image('BLOCK', '/assets/map/bt_tile.png')
   scene.load.image('TELEPORT', '/assets/map/tp_tile.png')
   scene.load.image('blank_tile', '/assets/map/blank_tile.png')
   scene.load.image('waypoint', '/assets/waypoint.png')
 
-  /**
-   * Because Phaser can't load tiles after the scene with map in it is created,
-   * we need to load and cache all the tiles first.
-   * Then load them into the scene.
-   */
-  scene.load.rexAwait(async function (successCallback: any) {
-    const tiles: { data: TextureData[] } = await fetch(config.server_endpoint + '/assets/list_tiles').then((response) => response.json())
+  // Get all tiles from IndexedDB and load them into the scene
+  await loadAllTilesIntoScene(scene)
 
-    for await (const tile of tiles?.data ?? []) {
-      await loadTexture(scene, tile)
-    }
-
-    successCallback()
+  // Wait for all assets to be loaded before continuing
+  await new Promise<void>((resolve) => {
+    scene.load.on(Phaser.Loader.Events.COMPLETE, () => {
+      resolve()
+    })
+    isLoaded.value = true
   })
 }
 
-const createScene = async (scene: Phaser.Scene) => {}
+function save() {
+  const currentMap = mapEditor.currentMap.value
+  if (!currentMap) return
+
+  const data = {
+    mapId: currentMap.id,
+    name: currentMap.name,
+    width: currentMap.width,
+    height: currentMap.height,
+    tiles: currentMap.tiles,
+    pvp: currentMap.pvp,
+    mapEffects: currentMap.mapEffects?.map(({ id, effect, strength }) => ({ id, effect, strength })) ?? [],
+    mapEventTiles: currentMap.mapEventTiles?.map(({ id, type, positionX, positionY, teleport }) => ({ id, type, positionX, positionY, teleport })) ?? [],
+    placedMapObjects: currentMap.placedMapObjects?.map(({ id, mapObject, depth, isRotated, positionX, positionY }) => ({ id, mapObject, depth, isRotated, positionX, positionY })) ?? []
+  }
+
+  gameStore.connection?.emit('gm:map:update', data, (response: MapT) => {
+    mapStorage.update(response.id, response)
+  })
+}
+
+function clear() {
+  if (!mapEditor.currentMap.value) return
+
+  // Clear placed objects, event tiles and tiles
+  mapEditor.clearMap()
+}
 </script>

src/components/utilities/Controls.vue

@@ -3,8 +3,7 @@
 </template>
 
 <script setup lang="ts">
-import { useCameraControls } from '@/composables/useCameraControls'
-import { usePointerHandlers } from '@/composables/usePointerHandlers'
+import { useControlsComposable } from '@/composables/useControlsComposable'
 import { Image, useScene } from 'phavuer'
 import { onBeforeUnmount, ref } from 'vue'
 
@@ -14,45 +13,16 @@ type WayPoint = { visible: boolean; x: number; y: number }
 // Props
 const props = defineProps<{ layer: Phaser.Tilemaps.TilemapLayer }>()
 
-// Constants
-const ZOOM_SETTINGS = {
-  WHEEL_FACTOR: 0.005,
-  KEY_FACTOR: 0.3,
-  MIN: 1,
-  MAX: 3
-} as const
-
 // Setup
 const scene = useScene()
 const waypoint = ref<WayPoint>({ visible: false, x: 0, y: 0 })
-const { camera } = useCameraControls(scene)
-const { setupPointerHandlers, cleanupPointerHandlers } = usePointerHandlers(scene, props.layer, waypoint, camera)
-
-// Handlers
-function handleScrollZoom(pointer: Phaser.Input.Pointer) {
-  if (!(pointer.event instanceof WheelEvent && pointer.event.shiftKey)) return
-
-  const zoomLevel = Phaser.Math.Clamp(camera.zoom - pointer.event.deltaY * ZOOM_SETTINGS.WHEEL_FACTOR, ZOOM_SETTINGS.MIN, ZOOM_SETTINGS.MAX)
-  camera.setZoom(zoomLevel)
-}
-
-function handleKeyComboZoom(event: { keyCodes: number[] }) {
-  const deltaY = event.keyCodes[1] === 38 ? 1 : -1 // 38 is Up, 40 is Down
-  const zoomLevel = Phaser.Math.Clamp(camera.zoom + deltaY * ZOOM_SETTINGS.KEY_FACTOR, ZOOM_SETTINGS.MIN, ZOOM_SETTINGS.MAX)
-  camera.setZoom(zoomLevel)
-}
+const { setupControls, cleanupControls } = useControlsComposable(scene, props.layer, waypoint)
 
 // Event setup
-setupPointerHandlers()
-scene.input.keyboard?.createCombo([16, 38], { resetOnMatch: true }) // Shift + Up
-scene.input.keyboard?.createCombo([16, 40], { resetOnMatch: true }) // Shift + Down
-scene.input.keyboard?.on('keycombomatch', handleKeyComboZoom)
-scene.input.on(Phaser.Input.Events.POINTER_WHEEL, handleScrollZoom)
+setupControls()
 
 // Cleanup
 onBeforeUnmount(() => {
-  cleanupPointerHandlers()
-  scene.input.keyboard?.off('keycombomatch')
-  scene.input.off(Phaser.Input.Events.POINTER_WHEEL, handleScrollZoom)
+  cleanupControls()
 })
 </script>

src/components/utilities/Modal.vue

@@ -17,7 +17,7 @@
           <button v-if="canFullScreen" @click="toggleFullScreen" class="w-5 h-5 m-0 p-0 relative hover:scale-110 transition-transform duration-300 ease-in-out">
             <img :alt="isFullScreen ? 'exit full-screen' : 'full-screen'" :src="isFullScreen ? '/assets/icons/modal/minimize.svg' : '/assets/icons/modal/increase-size-option.svg'" class="w-3.5 h-3.5 invert" draggable="false" />
           </button>
-          <button v-if="closable" @click="emit('modal:close')" class="w-3.5 h-3.5 m-0 p-0 relative hover:rotate-180 transition-transform duration-300 ease-in-out">
+          <button v-if="closable" @click="closeModal" class="w-3.5 h-3.5 m-0 p-0 relative hover:rotate-180 transition-transform duration-300 ease-in-out">
             <img alt="close" src="/assets/icons/modal/close-button-white.svg" class="w-full h-full" draggable="false" />
           </button>
         </div>
@@ -46,7 +46,7 @@
 import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 
 interface ModalProps {
-  isModalOpen: boolean
+  isModalOpen?: boolean
   closable?: boolean
   isResizable?: boolean
   isFullScreen?: boolean
@@ -79,10 +79,16 @@ const props = withDefaults(defineProps<ModalProps>(), {
 })
 
 const emit = defineEmits<{
+  'modal:open': []
   'modal:close': []
-  'character:create': []
 }>()
 
+defineExpose({
+  open: () => (isModalOpenRef.value = true),
+  close: () => (isModalOpenRef.value = false),
+  toggle: () => (isModalOpenRef.value = !isModalOpenRef.value)
+})
+
 const isModalOpenRef = ref(props.isModalOpen)
 const width = ref(props.modalWidth)
 const height = ref(props.modalHeight)
@@ -150,6 +156,11 @@ function drag(event: MouseEvent) {
   y.value = dragState.initialY + (event.clientY - dragState.startY)
 }
 
+function closeModal() {
+  isModalOpenRef.value = false
+  emit('modal:close')
+}
+
 function toggleFullScreen() {
   if (isFullScreen.value) {
     Object.assign({ x, y, width, height }, preFullScreenState)

src/components/utilities/Notifications.vue

@@ -1,5 +1,5 @@
 <template>
-  <Modal v-for="notification in gameStore.notifications" :key="notification.id" :isModalOpen="true" @modal:close="closeNotification(notification.id)">
+  <Modal v-for="notification in gameStore.notifications" :key="notification.id" :isModalOpen="true" @modal:close="closeNotification(notification!.id as string)">
     <template #modalHeader v-if="notification.title">
       <h3 class="m-0 font-medium shrink-0 text-white">{{ notification.title }}</h3>
     </template>

src/composables/controls/useBaseControlsComposable.ts

@@ -0,0 +1,69 @@
+import config from '@/application/config'
+import { getTile, tileToWorldXY } from '@/composables/mapComposable'
+import { useGameStore } from '@/stores/gameStore'
+import { ref, type Ref } from 'vue'
+
+export function useBaseControlsComposable(scene: Phaser.Scene, layer: Phaser.Tilemaps.TilemapLayer, waypoint: Ref<{ visible: boolean; x: number; y: number }>, camera: Phaser.Cameras.Scene2D.Camera) {
+  const gameStore = useGameStore()
+  const pointerStartPosition = ref({ x: 0, y: 0 })
+  const dragThreshold = 5 // pixels
+
+  function updateWaypoint(worldX: number, worldY: number) {
+    const pointerTile = getTile(layer, worldX, worldY)
+    if (!pointerTile) {
+      waypoint.value.visible = false
+      return
+    }
+    const worldPoint = tileToWorldXY(layer, pointerTile.x, pointerTile.y)
+    if (!worldPoint.worldPositionX || !worldPoint.worldPositionX) return
+
+    waypoint.value = {
+      visible: true,
+      x: worldPoint.worldPositionX,
+      y: worldPoint.worldPositionY + config.tile_size.height + 15
+    }
+  }
+
+  function handleDragMap(pointer: Phaser.Input.Pointer) {
+    if (!gameStore.game.isPlayerDraggingCamera) return
+
+    const deltaX = pointer.x - pointerStartPosition.value.x
+    const deltaY = pointer.y - pointerStartPosition.value.y
+
+    if (Math.abs(deltaX) <= dragThreshold && Math.abs(deltaY) <= dragThreshold) return
+
+    const scrollX = camera.scrollX - deltaX / camera.zoom
+    const scrollY = camera.scrollY - deltaY / camera.zoom
+
+    camera.setScroll(scrollX, scrollY)
+    pointerStartPosition.value = { x: pointer.x, y: pointer.y }
+  }
+
+  function startDragging(pointer: Phaser.Input.Pointer) {
+    pointerStartPosition.value = { x: pointer.x, y: pointer.y }
+    gameStore.setPlayerDraggingCamera(true)
+  }
+
+  function stopDragging() {
+    gameStore.setPlayerDraggingCamera(false)
+  }
+
+  function handleZoom(pointer: Phaser.Input.Pointer) {
+    if (pointer.event instanceof WheelEvent && pointer.event.shiftKey) {
+      const deltaY = pointer.event.deltaY
+      const zoomLevel = camera.zoom - deltaY * 0.005
+      if (zoomLevel > 0 && zoomLevel < 3) {
+        camera.setZoom(zoomLevel)
+      }
+    }
+  }
+
+  return {
+    updateWaypoint,
+    handleDragMap,
+    startDragging,
+    stopDragging,
+    handleZoom,
+    pointerStartPosition
+  }
+}

src/composables/controls/useGameControlsComposable.ts

@@ -0,0 +1,114 @@
+import { getTile } from '@/composables/mapComposable'
+import { useGameStore } from '@/stores/gameStore'
+import type { Ref } from 'vue'
+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)
+
+  function handlePointerDown(pointer: Phaser.Input.Pointer) {
+    baseHandlers.startDragging(pointer)
+  }
+
+  function handlePointerMove(pointer: Phaser.Input.Pointer) {
+    baseHandlers.updateWaypoint(pointer.worldX, pointer.worldY)
+    baseHandlers.handleDragMap(pointer)
+  }
+
+  function handlePointerUp(pointer: Phaser.Input.Pointer) {
+    baseHandlers.stopDragging()
+
+    const pointerTile = getTile(layer, pointer.worldX, pointer.worldY)
+    if (!pointerTile) return
+
+    gameStore.connection?.emit('map:character:move', {
+      positionX: pointerTile.x,
+      positionY: pointerTile.y
+    })
+  }
+
+  const pressedKeys = new Set<string>()
+  let moveInterval: number | null = null
+
+  function handleKeyDown(event: KeyboardEvent) {
+    if (!gameStore.character) return
+
+    // console.log(event.key)
+
+    if (['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'].includes(event.key)) {
+      pressedKeys.add(event.key)
+
+      // Start movement loop if not already running
+      if (!moveInterval) {
+        moveInterval = window.setInterval(moveCharacter, 250) // Adjust timing as needed
+        moveCharacter() // Move immediately on first press
+      }
+    }
+
+    // Attack on CTRL
+    if (event.key === 'Control') {
+      gameStore.connection?.emit('map:character:attack')
+    }
+  }
+
+  function handleKeyUp(event: KeyboardEvent) {
+    pressedKeys.delete(event.key)
+
+    // If no movement keys are pressed, clear the interval
+    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 = () => {
+    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)
+    scene.input.on(Phaser.Input.Events.POINTER_WHEEL, baseHandlers.handleZoom)
+    scene.input.keyboard!.on('keydown', handleKeyDown)
+    scene.input.keyboard!.on('keyup', handleKeyUp)
+  }
+
+  const cleanupControls = () => {
+    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)
+    scene.input.off(Phaser.Input.Events.POINTER_WHEEL, baseHandlers.handleZoom)
+    scene.input.keyboard!.off('keydown', handleKeyDown)
+    scene.input.keyboard!.off('keyup', handleKeyUp)
+  }
+
+  return { setupControls, cleanupControls }
+}

src/composables/controls/useMapEditorControlsComposable.ts

@@ -0,0 +1,42 @@
+import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
+import { computed, type Ref } from 'vue'
+import { useBaseControlsComposable } from './useBaseControlsComposable'
+
+export function useMapEditorControlsComposable(scene: Phaser.Scene, layer: Phaser.Tilemaps.TilemapLayer, waypoint: Ref<{ visible: boolean; x: number; y: number }>, camera: Phaser.Cameras.Scene2D.Camera) {
+  const mapEditor = useMapEditorComposable()
+  const baseHandlers = useBaseControlsComposable(scene, layer, waypoint, camera)
+  const isMoveTool = computed(() => mapEditor.tool.value === 'move')
+
+  function handlePointerDown(pointer: Phaser.Input.Pointer) {
+    if (isMoveTool.value || pointer.event.shiftKey) {
+      baseHandlers.startDragging(pointer)
+    }
+  }
+
+  function handlePointerMove(pointer: Phaser.Input.Pointer) {
+    if (isMoveTool.value || pointer.event.shiftKey) {
+      baseHandlers.handleDragMap(pointer)
+    }
+    baseHandlers.updateWaypoint(pointer.worldX, pointer.worldY)
+  }
+
+  function handlePointerUp(pointer: Phaser.Input.Pointer) {
+    baseHandlers.stopDragging()
+  }
+
+  const setupControls = () => {
+    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)
+    scene.input.on(Phaser.Input.Events.POINTER_WHEEL, baseHandlers.handleZoom)
+  }
+
+  const cleanupControls = () => {
+    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)
+    scene.input.off(Phaser.Input.Events.POINTER_WHEEL, baseHandlers.handleZoom)
+  }
+
+  return { setupControls, cleanupControls }
+}

src/composables/game/scene/loaderComposable.ts

@@ -1,34 +0,0 @@
-export function createSceneLoader(scene: Phaser.Scene) {
-  const width = scene.cameras.main.width
-  const height = scene.cameras.main.height
-
-  const progressBox = scene.add.graphics()
-  const progressBar = scene.add.graphics()
-  progressBox.fillStyle(0x222222, 0.8)
-  progressBox.fillRect(width / 2 - 180, height / 2, 320, 50)
-
-  const loadingText = scene.make.text({
-    x: width / 2,
-    y: height / 2 - 50,
-    text: 'Loading...',
-    style: {
-      font: '20px monospace',
-      // @ts-ignore
-      fill: '#ffffff'
-    }
-  })
-  loadingText.setOrigin(0.5, 0.5)
-
-  scene.load.on(Phaser.Loader.Events.PROGRESS, function (value: any) {
-    progressBar.clear()
-    progressBar.fillStyle(0x368f8b, 1)
-    progressBar.fillRect(width / 2 - 180 + 10, height / 2 + 10, 300 * value, 30)
-  })
-
-  scene.load.on(Phaser.Loader.Events.COMPLETE, function () {
-    progressBar.destroy()
-    progressBox.destroy()
-    loadingText.destroy()
-    return true
-  })
-}

src/composables/gameComposable.ts

@@ -26,7 +26,6 @@ export async function loadTexture(scene: Phaser.Scene, textureData: TextureData)
 
     // If asset is not found, download it
     if (!texture) {
-      console.log('Downloading texture:', textureData.key)
       await textureStorage.download(textureData)
       texture = await textureStorage.get(textureData.key)
     }
@@ -58,36 +57,32 @@ export async function loadTexture(scene: Phaser.Scene, textureData: TextureData)
 }
 
 export async function loadSpriteTextures(scene: Phaser.Scene, sprite_id: string) {
-  if (!sprite_id) return
+  if (!sprite_id) return false
 
-  console.log(sprite_id)
-  // @TODO: Fix this
   const spriteStorage = new SpriteStorage()
   const sprite = await spriteStorage.get(sprite_id)
 
   if (!sprite) {
     console.error('Failed to load sprite:', sprite_id)
-    return
+    return false
   }
 
   for await (const sprite_action of sprite.spriteActions) {
-    console.log('Loading sprite action:', sprite.id + '-' + sprite_action.action)
     const key = sprite.id + '-' + sprite_action.action
     await loadTexture(scene, {
       key,
       data: '/textures/sprites/' + sprite.id + '/' + sprite_action.action + '.png',
-      group: sprite_action.isAnimated ? 'sprite_animations' : 'sprites',
+      group: sprite_action.frameCount > 1 ? 'sprite_animations' : 'sprites',
       updatedAt: sprite_action.updatedAt,
       originX: sprite_action.originX,
       originY: sprite_action.originY,
-      isAnimated: sprite_action.isAnimated,
       frameWidth: sprite_action.frameWidth,
       frameHeight: sprite_action.frameHeight,
       frameRate: sprite_action.frameRate
     } as TextureData)
 
-    // If the sprite is not animated, skip
-    if (!sprite_action.isAnimated) continue
+    // If the sprite has no more than one frame, skip
+    if (sprite_action.frameCount <= 1) continue
 
     // Check if animation already exists
     if (scene.anims.get(key)) continue
@@ -102,5 +97,5 @@ export async function loadSpriteTextures(scene: Phaser.Scene, sprite_id: string)
       repeat: -1
     })
   }
-  return Promise.resolve(true)
+  return true
 }

src/composables/mapComposable.ts

@@ -1,23 +1,21 @@
 import config from '@/application/config'
-import type { HttpResponse, TextureData, UUID } from '@/application/types'
+import type { HttpResponse, TextureData, Tile as TileT, UUID } from '@/application/types'
 import { unduplicateArray } from '@/application/utilities'
 import { loadTexture } from '@/composables/gameComposable'
-import { MapStorage } from '@/storage/storages'
+import { MapStorage, TileStorage } from '@/storage/storages'
 
 import Tilemap = Phaser.Tilemaps.Tilemap
 import TilemapLayer = Phaser.Tilemaps.TilemapLayer
 import Tileset = Phaser.Tilemaps.Tileset
 import Tile = Phaser.Tilemaps.Tile
 
-export function getTile(layer: TilemapLayer | Tilemap, positionX: number, positionY: number): Tile | undefined {
-  const tile = layer.getTileAtWorldXY(positionX, positionY)
-  if (!tile) return undefined
-  return tile
+export function getTile(layer: TilemapLayer | Tilemap, positionX: number, positionY: number): Tile | null {
+  return layer.getTileAtWorldXY(positionX, positionY)
 }
 
 export function tileToWorldXY(layer: TilemapLayer | Tilemap, positionX: number, positionY: number) {
   const worldPoint = layer.tileToWorldXY(positionX, positionY)
-  if (!worldPoint) return { positionX: 0, positionY: 0 }
+  if (!worldPoint) return { worldPositionX: 0, worldPositionY: 0 }
 
   const worldPositionX = worldPoint.x + config.tile_size.height
   const worldPositionY = worldPoint.y
@@ -77,31 +75,42 @@ export const calculateIsometricDepth = (positionX: number, positionY: number, wi
   return baseDepth + (width + height) / (2 * config.tile_size.width)
 }
 
-export function FlattenMapArray(tiles: string[][]) {
-  const normalArray = []
-
-  for (const row of tiles) {
-    normalArray.push(...row)
-  }
-
-  return normalArray
-}
-
-export async function loadMapTilesIntoScene(map_id: UUID, scene: Phaser.Scene) {
-  const mapStorage = new MapStorage()
-  const map = await mapStorage.get(map_id)
-  if (!map) return
-
-  const tileArray = unduplicateArray(FlattenMapArray(map.tiles))
-
+async function getTiles(tiles: TileT[], scene: Phaser.Scene) {
   // Load each tile into the scene
-  for (const tile of tileArray) {
+  for (const tile of tiles) {
+    if (!tile) continue
     const textureData = {
-      key: tile,
-      data: '/textures/tiles/' + tile + '.png',
+      key: tile.id,
+      data: '/textures/tiles/' + tile.id + '.png',
       group: 'tiles',
-      updatedAt: map.updatedAt // @TODO: Fix this
+      updatedAt: tile.updatedAt
     } as TextureData
     await loadTexture(scene, textureData)
   }
 }
+
+export async function loadMapTilesIntoScene(map_id: UUID, scene: Phaser.Scene) {
+  const tileStorage = new TileStorage()
+  const mapStorage = new MapStorage()
+  const map = await mapStorage.get(map_id)
+  if (!map) return
+
+  const tileArray = unduplicateArray(map.tiles)
+  const tiles = await tileStorage.getByIds(tileArray)
+
+  await getTiles(tiles, scene)
+}
+
+export async function loadTilesIntoScene(tileIds: string[], scene: Phaser.Scene) {
+  const tileStorage = new TileStorage()
+  const tiles = await tileStorage.getByIds(tileIds)
+
+  await getTiles(tiles, scene)
+}
+
+export async function loadAllTilesIntoScene(scene: Phaser.Scene) {
+  const tileStorage = new TileStorage()
+  const tiles = await tileStorage.getAll()
+
+  await getTiles(tiles, scene)
+}

src/composables/pointerHandlers/useGamePointerHandlers.ts

@@ -1,77 +0,0 @@
-import config from '@/application/config'
-import { getTile, tileToWorldXY } from '@/composables/mapComposable'
-import { useGameStore } from '@/stores/gameStore'
-import { ref, type Ref } from 'vue'
-
-export function useGamePointerHandlers(scene: Phaser.Scene, layer: Phaser.Tilemaps.TilemapLayer, waypoint: Ref<{ visible: boolean; x: number; y: number }>, camera: Phaser.Cameras.Scene2D.Camera) {
-  const gameStore = useGameStore()
-  const pointerStartPosition = ref({ x: 0, y: 0 })
-  const dragThreshold = 5 // pixels
-
-  function updateWaypoint(worldX: number, worldY: number) {
-    const pointerTile = getTile(layer, worldX, worldY)
-    if (!pointerTile) {
-      waypoint.value.visible = false
-      return
-    }
-    const worldPoint = tileToWorldXY(layer, pointerTile.x, pointerTile.y)
-    if (!worldPoint.worldPositionX || !worldPoint.worldPositionX) return
-
-    waypoint.value = {
-      visible: true,
-      x: worldPoint.worldPositionX,
-      y: worldPoint.worldPositionY + config.tile_size.height + 15
-    }
-  }
-
-  function handlePointerDown(pointer: Phaser.Input.Pointer) {
-    pointerStartPosition.value = { x: pointer.x, y: pointer.y }
-    gameStore.setPlayerDraggingCamera(true)
-  }
-
-  function handlePointerMove(pointer: Phaser.Input.Pointer) {
-    updateWaypoint(pointer.worldX, pointer.worldY)
-
-    if (!gameStore.game.isPlayerDraggingCamera) return
-
-    const distance = Phaser.Math.Distance.Between(pointerStartPosition.value.x, pointerStartPosition.value.y, pointer.x, pointer.y)
-
-    // If the distance is less than the drag threshold, return
-    // We do this to prevent the camera from scrolling too quickly
-    if (distance <= dragThreshold) return
-
-    camera.setScroll(camera.scrollX - (pointer.x - pointer.prevPosition.x) / camera.zoom, camera.scrollY - (pointer.y - pointer.prevPosition.y) / camera.zoom)
-  }
-
-  function handlePointerUp(pointer: Phaser.Input.Pointer) {
-    gameStore.setPlayerDraggingCamera(false)
-
-    const distance = Phaser.Math.Distance.Between(pointerStartPosition.value.x, pointerStartPosition.value.y, pointer.x, pointer.y)
-
-    // If the distance is greater than the drag threshold, return
-    // We do this to prevent the camera from scrolling too quickly
-    if (distance > dragThreshold) return
-
-    const pointerTile = getTile(layer, pointer.worldX, pointer.worldY)
-    if (!pointerTile) return
-
-    gameStore.connection?.emit('map:character:move', {
-      positionX: pointerTile.x,
-      positionY: pointerTile.y
-    })
-  }
-
-  const setupPointerHandlers = () => {
-    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)
-  }
-
-  const cleanupPointerHandlers = () => {
-    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)
-  }
-
-  return { setupPointerHandlers, cleanupPointerHandlers }
-}

src/composables/pointerHandlers/useMapEditorPointerHandlers.ts

@@ -1,63 +0,0 @@
-import config from '@/application/config'
-import { getTile, tileToWorldXY } from '@/composables/mapComposable'
-import { useGameStore } from '@/stores/gameStore'
-import { useMapEditorStore } from '@/stores/mapEditorStore'
-import { computed, type Ref } from 'vue'
-
-export function useMapEditorPointerHandlers(scene: Phaser.Scene, layer: Phaser.Tilemaps.TilemapLayer, waypoint: Ref<{ visible: boolean; x: number; y: number }>, camera: Phaser.Cameras.Scene2D.Camera) {
-  const gameStore = useGameStore()
-  const mapEditorStore = useMapEditorStore()
-  const isMoveTool = computed(() => mapEditorStore.tool === 'move')
-
-  function updateWaypoint(pointer: Phaser.Input.Pointer) {
-    const { x: px, y: py } = camera.getWorldPoint(pointer.x, pointer.y)
-    const pointerTile = getTile(layer, px, py)
-
-    if (pointerTile) {
-      const worldPoint = tileToWorldXY(layer, pointerTile.x, pointerTile.y)
-      if (!worldPoint.positionX || !worldPoint.positionY) return
-
-      waypoint.value = {
-        visible: true,
-        x: worldPoint.positionX,
-        y: worldPoint.positionY + config.tile_size.height + 15
-      }
-    } else {
-      waypoint.value.visible = false
-    }
-  }
-
-  function dragMap(pointer: Phaser.Input.Pointer) {
-    if (!gameStore.game.isPlayerDraggingCamera) return
-    camera.setScroll(camera.scrollX - (pointer.x - pointer.prevPosition.x) / camera.zoom, scrollY - (pointer.y - pointer.prevPosition.y) / camera.zoom)
-  }
-
-  function handlePointerMove(pointer: Phaser.Input.Pointer) {
-    if (isMoveTool.value || pointer.event.shiftKey) {
-      dragMap(pointer)
-    }
-    updateWaypoint(pointer)
-  }
-
-  function handleZoom(pointer: Phaser.Input.Pointer) {
-    if (pointer.event instanceof WheelEvent && pointer.event.shiftKey) {
-      const deltaY = pointer.event.deltaY
-      const zoomLevel = camera.zoom - deltaY * 0.005
-      if (zoomLevel > 0 && zoomLevel < 3) {
-        camera.setZoom(zoomLevel)
-      }
-    }
-  }
-
-  const setupPointerHandlers = () => {
-    scene.input.on(Phaser.Input.Events.POINTER_MOVE, handlePointerMove)
-    scene.input.on(Phaser.Input.Events.POINTER_WHEEL, handleZoom)
-  }
-
-  const cleanupPointerHandlers = () => {
-    scene.input.off(Phaser.Input.Events.POINTER_MOVE, handlePointerMove)
-    scene.input.off(Phaser.Input.Events.POINTER_WHEEL, handleZoom)
-  }
-
-  return { setupPointerHandlers, cleanupPointerHandlers }
-}

src/composables/useCameraControls.ts

@@ -1,15 +0,0 @@
-import { useGameStore } from '@/stores/gameStore'
-import { useMapStore } from '@/stores/mapStore'
-
-export function useCameraControls(scene: Phaser.Scene) {
-  const gameStore = useGameStore()
-  const camera = scene.cameras.main
-
-  const onPointerDown = () => gameStore.setPlayerDraggingCamera(true)
-  const onPointerUp = () => gameStore.setPlayerDraggingCamera(false)
-
-  scene.input.on(Phaser.Input.Events.POINTER_DOWN, onPointerDown)
-  scene.input.on(Phaser.Input.Events.POINTER_UP, onPointerUp)
-
-  return { camera }
-}

src/composables/useCharacterSpriteComposable.ts

@@ -0,0 +1,136 @@
+import { Direction } from '@/application/enums'
+import { type MapCharacter } from '@/application/types'
+import { loadSpriteTextures } from '@/composables/gameComposable'
+import { calculateIsometricDepth, tileToWorldX, tileToWorldY } from '@/composables/mapComposable'
+import { CharacterTypeStorage } from '@/storage/storages'
+import { refObj } from 'phavuer'
+import { computed, ref } from 'vue'
+
+export function useCharacterSprite(scene: Phaser.Scene, tilemap: Phaser.Tilemaps.Tilemap, mapCharacter: MapCharacter) {
+  const characterContainer = refObj<Phaser.GameObjects.Container>()
+  const characterSpriteId = ref('')
+  const characterSprite = refObj<Phaser.GameObjects.Sprite>()
+  const currentPositionX = ref(0)
+  const currentPositionY = ref(0)
+  const isometricDepth = ref(1)
+  const isInitialPosition = ref(true)
+  const tween = ref<Phaser.Tweens.Tween | null>(null)
+
+  const updateIsometricDepth = (positionX: number, positionY: number) => {
+    isometricDepth.value = calculateIsometricDepth(positionX, positionY, 28, 94, true)
+  }
+
+  const updatePosition = (positionX: number, positionY: number, direction: Direction) => {
+    const newPositionX = tileToWorldX(tilemap, positionX, positionY)
+    const newPositionY = tileToWorldY(tilemap, positionX, positionY)
+
+    if (isInitialPosition.value) {
+      currentPositionX.value = newPositionX
+      currentPositionY.value = newPositionY
+      isInitialPosition.value = false
+      return
+    }
+
+    if (tween.value?.isPlaying()) {
+      tween.value.stop()
+    }
+
+    const distance = Math.sqrt(Math.pow(newPositionX - currentPositionX.value, 2) + Math.pow(newPositionY - currentPositionY.value, 2))
+    const baseSpeed = 150 // pixels per second
+    const duration = (distance / baseSpeed) * 1000 // Convert to milliseconds
+
+    tween.value = tilemap.scene.tweens.add({
+      targets: characterContainer.value,
+      x: newPositionX,
+      y: newPositionY,
+      duration,
+      ease: 'Linear',
+      onStart: () => {
+        if (direction === Direction.POSITIVE) {
+          updateIsometricDepth(positionX, positionY)
+        }
+      },
+      onUpdate: () => {
+        currentPositionX.value = characterContainer.value?.x ?? currentPositionX.value
+        currentPositionY.value = characterContainer.value?.y ?? currentPositionY.value
+      },
+      onComplete: () => {
+        if (direction === Direction.NEGATIVE) {
+          updateIsometricDepth(positionX, positionY)
+        }
+      }
+    })
+  }
+
+  const calcDirection = (oldPositionX: number, oldPositionY: number, newPositionX: number, newPositionY: number): Direction => {
+    if (newPositionY < oldPositionY || newPositionX < oldPositionX) return Direction.NEGATIVE
+    if (newPositionX > oldPositionX || newPositionY > oldPositionY) return Direction.POSITIVE
+    return Direction.UNCHANGED
+  }
+
+  const isFlippedX = computed(() => [6, 4].includes(mapCharacter.character.rotation ?? 0))
+
+  const currentDirection = computed(() => {
+    return [0, 6].includes(mapCharacter.character.rotation ?? 0) ? 'left_up' : 'right_down'
+  })
+
+  const currentAction = computed(() => {
+    return mapCharacter.isMoving ? 'walk' : 'idle'
+  })
+
+  const charTexture = computed(() => {
+    const spriteId = characterSpriteId.value ?? 'idle_right_down'
+    return `${spriteId}-${currentAction.value}_${currentDirection.value}`
+  })
+
+  const updateSprite = () => {
+    if (!characterSprite.value) return
+
+    if (mapCharacter.isMoving) {
+      characterSprite.value.anims.play(charTexture.value, true)
+    } else {
+      characterSprite.value.anims.stop()
+      characterSprite.value.setFrame(0)
+      characterSprite.value.setTexture(charTexture.value)
+    }
+  }
+
+  const initializeSprite = async () => {
+    const characterTypeStorage = new CharacterTypeStorage()
+    const spriteId = await characterTypeStorage.getSpriteId(mapCharacter.character.characterType!)
+    if (!spriteId) return
+
+    characterSpriteId.value = spriteId
+    await loadSpriteTextures(scene, spriteId)
+
+    if (characterContainer.value) {
+      characterContainer.value.setName(mapCharacter.character.name)
+    }
+
+    if (characterSprite.value) {
+      characterSprite.value.setTexture(charTexture.value)
+      characterSprite.value.setFlipX(isFlippedX.value)
+    }
+
+    updatePosition(mapCharacter.character.positionX, mapCharacter.character.positionY, mapCharacter.character.rotation)
+  }
+
+  const cleanup = () => {
+    tween.value?.stop()
+  }
+
+  return {
+    characterContainer,
+    characterSpriteId,
+    characterSprite,
+    currentPositionX,
+    currentPositionY,
+    isometricDepth,
+    isFlippedX,
+    updatePosition,
+    calcDirection,
+    updateSprite,
+    initializeSprite,
+    cleanup
+  }
+}

src/composables/useControlsComposable.ts

@@ -0,0 +1,18 @@
+import { useGameControlsComposable } from '@/composables/controls/useGameControlsComposable'
+import { useMapEditorControlsComposable } from '@/composables/controls/useMapEditorControlsComposable'
+import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
+import { computed, type Ref } from 'vue'
+
+export function useControlsComposable(scene: Phaser.Scene, layer: Phaser.Tilemaps.TilemapLayer, waypoint: Ref<{ visible: boolean; x: number; y: number }>) {
+  const camera = scene.cameras.main
+  const gameHandlers = useGameControlsComposable(scene, layer, waypoint, camera)
+  const mapEditorHandlers = useMapEditorControlsComposable(scene, layer, waypoint, camera)
+
+  const mapEditor = useMapEditorComposable()
+  const currentHandlers = computed(() => (mapEditor.active.value ? mapEditorHandlers : gameHandlers))
+
+  const setupControls = () => currentHandlers.value.setupControls()
+  const cleanupControls = () => currentHandlers.value.cleanupControls()
+
+  return { setupControls, cleanupControls, camera }
+}

src/composables/useMapEditorComposable.ts

@@ -0,0 +1,109 @@
+import type { Map, MapObject } from '@/application/types'
+import { ref } from 'vue'
+
+export type TeleportSettings = {
+  toMapId: string
+  toPositionX: number
+  toPositionY: number
+  toRotation: number
+}
+
+const currentMap = ref<Map | null>(null)
+const active = ref(false)
+const tool = ref('move')
+const drawMode = ref('tile')
+const selectedTile = ref('')
+const selectedMapObject = ref<MapObject | null>(null)
+const shouldClearTiles = ref(false)
+const teleportSettings = ref<TeleportSettings>({
+  toMapId: '',
+  toPositionX: 0,
+  toPositionY: 0,
+  toRotation: 0
+})
+
+export function useMapEditorComposable() {
+  const loadMap = (map: Map) => {
+    currentMap.value = map
+  }
+
+  const updateProperty = <K extends keyof Map>(property: K, value: Map[K]) => {
+    if (currentMap.value) {
+      currentMap.value[property] = value
+    }
+  }
+
+  const clearMap = () => {
+    if (!currentMap.value) return
+    currentMap.value.placedMapObjects = []
+    currentMap.value.mapEventTiles = []
+    currentMap.value.tiles = []
+  }
+
+  const toggleActive = () => {
+    if (active.value) reset()
+    active.value = !active.value
+  }
+
+  const setTool = (newTool: string) => {
+    tool.value = newTool
+  }
+
+  const setDrawMode = (mode: string) => {
+    drawMode.value = mode
+  }
+
+  const setSelectedTile = (tile: string) => {
+    selectedTile.value = tile
+  }
+
+  const setSelectedMapObject = (object: MapObject) => {
+    selectedMapObject.value = object
+  }
+
+  const setTeleportSettings = (settings: TeleportSettings) => {
+    teleportSettings.value = settings
+  }
+
+  const triggerClearTiles = () => {
+    shouldClearTiles.value = true
+  }
+
+  const resetClearTilesFlag = () => {
+    shouldClearTiles.value = false
+  }
+
+  const reset = () => {
+    tool.value = 'move'
+    drawMode.value = 'tile'
+    selectedTile.value = ''
+    selectedMapObject.value = null
+    shouldClearTiles.value = false
+  }
+
+  return {
+    // State
+    currentMap,
+    active,
+    tool,
+    drawMode,
+    selectedTile,
+    selectedMapObject,
+    shouldClearTiles,
+    teleportSettings,
+
+    // Methods
+    loadMap,
+    updateProperty,
+    clearMap,
+    toggleActive,
+    setTool,
+    setDrawMode,
+    setSelectedTile,
+    setSelectedMapObject,
+    setTeleportSettings,
+    triggerClearTiles,
+    resetClearTilesFlag,
+    reset
+  }
+}

src/composables/usePointerHandlers.ts

@@ -1,25 +0,0 @@
-import { useMapEditorStore } from '@/stores/mapEditorStore'
-import { computed, watch, type Ref } from 'vue'
-import { useGamePointerHandlers } from './pointerHandlers/useGamePointerHandlers'
-import { useMapEditorPointerHandlers } from './pointerHandlers/useMapEditorPointerHandlers'
-
-export function usePointerHandlers(scene: Phaser.Scene, layer: Phaser.Tilemaps.TilemapLayer, waypoint: Ref<{ visible: boolean; x: number; y: number }>, camera: Phaser.Cameras.Scene2D.Camera) {
-  const mapEditorStore = useMapEditorStore()
-  const gameHandlers = useGamePointerHandlers(scene, layer, waypoint, camera)
-  const mapEditorHandlers = useMapEditorPointerHandlers(scene, layer, waypoint, camera)
-
-  const currentHandlers = computed(() => (mapEditorStore.active ? mapEditorHandlers : gameHandlers))
-
-  const setupPointerHandlers = () => currentHandlers.value.setupPointerHandlers()
-  const cleanupPointerHandlers = () => currentHandlers.value.cleanupPointerHandlers()
-
-  watch(
-    () => mapEditorStore.active,
-    () => {
-      cleanupPointerHandlers()
-      setupPointerHandlers()
-    }
-  )
-
-  return { setupPointerHandlers, cleanupPointerHandlers }
-}

src/composables/useTileProcessingComposable.ts

@@ -0,0 +1,98 @@
+import config from '@/application/config'
+import type { Tile } from '@/application/types'
+import type { TileAnalysisResult, TileWorkerMessage } from '@/types/tileTypes'
+import { ref } from 'vue'
+
+// Constants for image processing
+const DOWNSCALE_WIDTH = 32
+const DOWNSCALE_HEIGHT = 16
+const COLOR_SIMILARITY_THRESHOLD = 30
+const EDGE_SIMILARITY_THRESHOLD = 20
+const BATCH_SIZE = 4
+
+export function useTileProcessingComposable() {
+  const tileAnalysisCache = ref<Map<string, { color: { r: number; g: number; b: number }; edge: number; namePrefix: string }>>(new Map())
+  const processingQueue = ref<Tile[]>([])
+  let isProcessing = false
+  const worker = new Worker(new URL('@/workers/tileAnalyzerWorker.ts', import.meta.url), { type: 'module' })
+
+  worker.onmessage = (e: MessageEvent<TileAnalysisResult>) => {
+    const { tileId, color, edge, namePrefix } = e.data
+    tileAnalysisCache.value.set(tileId, { color, edge, namePrefix })
+    isProcessing = false
+    processBatch()
+  }
+
+  async function processTileAsync(tile: Tile): Promise<void> {
+    if (tileAnalysisCache.value.has(tile.id)) return
+
+    return new Promise((resolve) => {
+      const img = new Image()
+      img.crossOrigin = 'Anonymous'
+      img.onload = () => {
+        const canvas = document.createElement('canvas')
+        const ctx = canvas.getContext('2d')
+        if (!ctx) {
+          resolve()
+          return
+        }
+
+        canvas.width = DOWNSCALE_WIDTH
+        canvas.height = DOWNSCALE_HEIGHT
+        ctx.drawImage(img, 0, 0, DOWNSCALE_WIDTH, DOWNSCALE_HEIGHT)
+
+        const imageData = ctx.getImageData(0, 0, DOWNSCALE_WIDTH, DOWNSCALE_HEIGHT)
+        const message: TileWorkerMessage = {
+          imageData,
+          tileId: tile.id,
+          tileName: tile.name
+        }
+        worker.postMessage(message)
+        resolve()
+      }
+      img.onerror = () => resolve()
+      img.src = `${config.server_endpoint}/textures/tiles/${tile.id}.png`
+    })
+  }
+
+  function processBatch() {
+    if (isProcessing || processingQueue.value.length === 0) return
+    isProcessing = true
+
+    const batch = processingQueue.value.splice(0, BATCH_SIZE)
+    Promise.all(batch.map((tile) => processTileAsync(tile))).then(() => {
+      isProcessing = false
+      if (processingQueue.value.length > 0) {
+        setTimeout(processBatch, 0)
+      }
+    })
+  }
+
+  function processTile(tile: Tile) {
+    if (!processingQueue.value.includes(tile)) {
+      processingQueue.value.push(tile)
+      processBatch()
+    }
+  }
+
+  function areTilesRelated(tile1: Tile, tile2: Tile): boolean {
+    const data1 = tileAnalysisCache.value.get(tile1.id)
+    const data2 = tileAnalysisCache.value.get(tile2.id)
+
+    if (!data1 || !data2) return false
+
+    const colorDifference = Math.sqrt(Math.pow(data1.color.r - data2.color.r, 2) + Math.pow(data1.color.g - data2.color.g, 2) + Math.pow(data1.color.b - data2.color.b, 2))
+
+    return colorDifference <= COLOR_SIMILARITY_THRESHOLD && Math.abs(data1.edge - data2.edge) <= EDGE_SIMILARITY_THRESHOLD && data1.namePrefix === data2.namePrefix
+  }
+
+  function cleanup() {
+    worker.terminate()
+  }
+
+  return {
+    processTile,
+    areTilesRelated,
+    cleanup
+  }
+}

src/storage/baseStorage.ts

@@ -4,10 +4,10 @@ export class BaseStorage<T extends { id: string }> {
   protected dexie: Dexie
   protected tableName: string
 
-  constructor(tableName: string, schema: string) {
+  constructor(tableName: string, schema: string, version = 1) {
     this.tableName = tableName
     this.dexie = new Dexie(tableName)
-    this.dexie.version(1).stores({
+    this.dexie.version(version).stores({
       [tableName]: schema
     })
   }
@@ -23,6 +23,22 @@ export class BaseStorage<T extends { id: string }> {
     }
   }
 
+  async update(id: string, item: Partial<T>) {
+    try {
+      await this.dexie.table(this.tableName).update(id, item)
+    } catch (error) {
+      console.error(`Failed to update ${this.tableName} ${id}:`, error)
+    }
+  }
+
+  async delete(id: string) {
+    try {
+      await this.dexie.table(this.tableName).delete(id)
+    } catch (error) {
+      console.error(`Failed to delete ${this.tableName} ${id}:`, error)
+    }
+  }
+
   async get(id: string): Promise<T | null> {
     try {
       const item = await this.dexie.table(this.tableName).get(id)
@@ -33,6 +49,16 @@ export class BaseStorage<T extends { id: string }> {
     }
   }
 
+  async getByIds(ids: string[]): Promise<T[]> {
+    try {
+      const items = await this.dexie.table(this.tableName).bulkGet(ids)
+      return items.filter((item) => item !== null)
+    } catch (error) {
+      console.error(`Failed to retrieve ${this.tableName} by ids:`, error)
+      return []
+    }
+  }
+
   async getAll(): Promise<T[]> {
     try {
       return await this.dexie.table(this.tableName).toArray()
@@ -42,6 +68,10 @@ export class BaseStorage<T extends { id: string }> {
     }
   }
 
+  liveQuery() {
+    return this.dexie.table(this.tableName).toArray()
+  }
+
   async reset() {
     try {
       await this.dexie.table(this.tableName).clear()

src/storage/storages.ts

@@ -40,4 +40,9 @@ export class CharacterHairStorage extends BaseStorage<any> {
   constructor() {
     super('characterHairs', 'id, name, createdAt, updatedAt')
   }
+
+  async getSpriteId(characterTypeId: string) {
+    const characterType = await this.get(characterTypeId)
+    return characterType?.sprite
+  }
 }

src/storage/textureStorage.ts

@@ -32,7 +32,6 @@ export class TextureStorage {
         updatedAt: texture.updatedAt,
         originX: texture.originX,
         originY: texture.originY,
-        isAnimated: texture.isAnimated,
         frameRate: texture.frameRate,
         frameWidth: texture.frameWidth,
         frameHeight: texture.frameHeight,

src/stores/gameStore.ts

@@ -15,9 +15,10 @@ export const useGameStore = defineStore('game', {
       character: null as Character | null,
       world: {
         date: new Date(),
-        isRainEnabled: false,
-        isFogEnabled: false,
+        weatherState: {
+          rainPercentage: 0,
           fogDensity: 0
+        }
       } as WorldSettings,
       game: {
         isLoading: false,
@@ -34,10 +35,7 @@ export const useGameStore = defineStore('game', {
     }
   },
   getters: {
-    getLoadedAssets: (state) => {
-      return state.game.loadedTextures
-    },
-    isAssetLoaded: (state) => {
+    isTextureLoaded: (state) => {
       return (key: string) => {
         return state.game.loadedTextures.includes(key)
       }
@@ -122,9 +120,8 @@ export const useGameStore = defineStore('game', {
       this.uiSettings.isGmPanelOpen = false
 
       this.world.date = new Date()
-      this.world.isRainEnabled = false
-      this.world.isFogEnabled = false
-      this.world.fogDensity = 0
+      this.world.weatherState.rainPercentage = 0
+      this.world.weatherState.fogDensity = 0
     }
   }
 })

src/stores/mapEditorStore.ts

@@ -1,9 +1,8 @@
-import type { Map, MapEffect, MapObject, PlacedMapObject, Tile } from '@/application/types'
-import { useGameStore } from '@/stores/gameStore'
+import type { MapObject, Map as MapT } from '@/application/types'
 import { defineStore } from 'pinia'
 
 export type TeleportSettings = {
-  toMap: Map | null
+  toMapId: string
   toPositionX: number
   toPositionY: number
   toRotation: number
@@ -12,31 +11,14 @@ export type TeleportSettings = {
 export const useMapEditorStore = defineStore('mapEditor', {
   state: () => {
     return {
-      active: false,
-      map: null as Map | null,
+      active: true,
       tool: 'move',
       drawMode: 'tile',
-      eraserMode: 'tile',
-      mapList: [] as Map[],
-      tileList: [] as Tile[],
-      mapObjectList: [] as MapObject[],
       selectedTile: '',
       selectedMapObject: null as MapObject | null,
-      isTileListModalShown: false,
-      isMapObjectListModalShown: false,
-      isMapListModalShown: false,
-      isCreateMapModalShown: false,
-      isSettingsModalShown: false,
       shouldClearTiles: false,
-      mapSettings: {
-        name: '',
-        width: 0,
-        height: 0,
-        pvp: false,
-        mapEffects: [] as MapEffect[]
-      },
       teleportSettings: {
-        toMap: null,
+        toMapId: '',
         toPositionX: 0,
         toPositionY: 0,
         toRotation: 0
@@ -44,66 +26,18 @@ export const useMapEditorStore = defineStore('mapEditor', {
     }
   },
   actions: {
-    toggleActive() {
-      const gameStore = useGameStore()
-      if (!this.active) gameStore.connection?.emit('map:character:leave')
-      if (this.active) this.reset()
-      this.active = !this.active
-    },
-    setMap(map: Map | null) {
-      this.map = map
-    },
-    setMapName(name: string) {
-      this.mapSettings.name = name
-    },
-    setMapWidth(width: number) {
-      this.mapSettings.width = width
-    },
-    setMapHeight(height: number) {
-      this.mapSettings.height = height
-    },
-    setMapPvp(pvp: boolean) {
-      if (!this.map) return
-      this.map.pvp = pvp
-    },
-    setMapEffects(mapEffects: MapEffect[]) {
-      if (!this.map) return
-      this.mapSettings.mapEffects = mapEffects
-    },
     setTool(tool: string) {
       this.tool = tool
     },
     setDrawMode(mode: string) {
       this.drawMode = mode
     },
-    setEraserMode(mode: string) {
-      this.eraserMode = mode
-    },
-    setMapList(maps: Map[]) {
-      this.mapList = maps
-    },
-    setTileList(tiles: Tile[]) {
-      this.tileList = tiles
-    },
-    setMapObjectList(objects: MapObject[]) {
-      this.mapObjectList = objects
-    },
     setSelectedTile(tile: string) {
       this.selectedTile = tile
     },
     setSelectedMapObject(object: MapObject) {
       this.selectedMapObject = object
     },
-    toggleSettingsModal() {
-      this.isSettingsModalShown = !this.isSettingsModalShown
-    },
-    toggleMapListModal() {
-      this.isMapListModalShown = !this.isMapListModalShown
-      this.isCreateMapModalShown = false
-    },
-    toggleCreateMapModal() {
-      this.isCreateMapModalShown = !this.isCreateMapModalShown
-    },
     setTeleportSettings(teleportSettings: TeleportSettings) {
       this.teleportSettings = teleportSettings
     },
@@ -113,20 +47,11 @@ export const useMapEditorStore = defineStore('mapEditor', {
     resetClearTilesFlag() {
       this.shouldClearTiles = false
     },
-    reset(resetMap = false) {
-      if (resetMap) this.map = null
-      this.mapList = []
-      this.tileList = []
-      this.mapObjectList = []
+    reset() {
       this.tool = 'move'
       this.drawMode = 'tile'
       this.selectedTile = ''
       this.selectedMapObject = null
-      this.isTileListModalShown = false
-      this.isMapObjectListModalShown = false
-      this.isSettingsModalShown = false
-      this.isMapListModalShown = false
-      this.isCreateMapModalShown = false
       this.shouldClearTiles = false
     }
   }

src/stores/mapStore.ts

@@ -31,6 +31,13 @@ export const useMapStore = defineStore('map', {
       const index = this.characters.findIndex((char) => char.character.id === updatedCharacter.character.id)
       if (index !== -1) this.characters[index] = updatedCharacter
     },
+    // Property is mapCharacter key
+    updateCharacterProperty<K extends keyof MapCharacter>(characterId: UUID, property: K, value: MapCharacter[K]) {
+      const character = this.characters.find((char) => char.character.id === characterId)
+      if (character) {
+        character[property] = value
+      }
+    },
     removeCharacter(characterId: UUID) {
       this.characters = this.characters.filter((char) => char.character.id !== characterId)
     },

src/types/tileTypes.ts

@@ -0,0 +1,20 @@
+export interface TileAnalysisResult {
+  tileId: string
+  color: {
+    r: number
+    g: number
+    b: number
+  }
+  edge: number
+  namePrefix: string
+}
+
+export interface TileWorkerMessage {
+  imageData: ImageData
+  tileId: string
+  tileName: string
+}
+
+export interface TileCache {
+  [key: string]: TileAnalysisResult
+}

src/workers/tileAnalyzerWorker.ts

@@ -0,0 +1,68 @@
+import type { TileAnalysisResult } from '@/types/tileTypes'
+
+const PIXEL_SAMPLE_RATE = 4
+
+self.onmessage = async (e: MessageEvent) => {
+  const { imageData, tileId, tileName } = e.data
+  const result = analyzeTile(imageData, tileId, tileName)
+  self.postMessage(result)
+}
+
+function analyzeTile(imageData: ImageData, tileId: string, tileName: string): TileAnalysisResult {
+  const { r, g, b } = getDominantColorFast(imageData)
+  const edge = getEdgeComplexityFast(imageData)
+  const namePrefix = tileName.split('_')[0]
+
+  return {
+    tileId,
+    color: { r, g, b },
+    edge,
+    namePrefix
+  }
+}
+
+function getDominantColorFast(imageData: ImageData) {
+  const data = new Uint8ClampedArray(imageData.data.buffer)
+  let r = 0,
+    g = 0,
+    b = 0,
+    total = 0
+  const length = data.length
+
+  for (let i = 0; i < length; i += 4 * PIXEL_SAMPLE_RATE) {
+    if (data[i + 3] > 0) {
+      r += data[i]
+      g += data[i + 1]
+      b += data[i + 2]
+      total++
+    }
+  }
+
+  return total > 0
+    ? {
+        r: Math.round(r / total),
+        g: Math.round(g / total),
+        b: Math.round(b / total)
+      }
+    : { r: 0, g: 0, b: 0 }
+}
+
+function getEdgeComplexityFast(imageData: ImageData) {
+  const data = new Uint8ClampedArray(imageData.data.buffer)
+  const width = imageData.width
+  const height = imageData.height
+  let edgePixels = 0
+
+  for (let y = 0; y < height; y += PIXEL_SAMPLE_RATE) {
+    for (let x = 0; x < width; x += PIXEL_SAMPLE_RATE) {
+      const i = (y * width + x) * 4
+      if (
+        data[i + 3] > 0 &&
+        (x === 0 || y === 0 || x >= width - PIXEL_SAMPLE_RATE || y >= height - PIXEL_SAMPLE_RATE || data[i - 4 * PIXEL_SAMPLE_RATE + 3] === 0 || data[i + 4 * PIXEL_SAMPLE_RATE + 3] === 0 || data[i - width * 4 * PIXEL_SAMPLE_RATE + 3] === 0 || data[i + width * 4 * PIXEL_SAMPLE_RATE + 3] === 0)
+      ) {
+        edgePixels++
+      }
+    }
+  }
+  return edgePixels * PIXEL_SAMPLE_RATE
+}