From 93baa10acfe0515edce4dc199e01cf4753d4509c Mon Sep 17 00:00:00 2001
From: Dennis Postma <dennis@directonline.io>
Date: Tue, 14 Jan 2025 02:39:41 +0100
Subject: [PATCH] Improvements

---
 src/App.vue                                   |  2 +-
 .../{game => }/gameMaster/GmPanel.vue         |  2 +-
 .../gameMaster/assetManager/AssetManager.vue  | 24 +++++++++----------
 .../characterHair/CharacterHairDetails.vue    |  0
 .../characterHair/CharacterHairList.vue       |  0
 .../characterType/CharacterTypeDetails.vue    |  0
 .../characterType/CharacterTypeList.vue       |  0
 .../partials/item/itemDetails.vue             |  0
 .../assetManager/partials/item/itemList.vue   |  0
 .../partials/mapObject/MapObjectDetails.vue   |  0
 .../partials/mapObject/MapObjectList.vue      |  0
 .../partials/sprite/SpriteDetails.vue         |  2 +-
 .../partials/sprite/SpriteList.vue            |  0
 .../sprite/partials/SpriteImagesInput.vue     |  0
 .../partials/tile/TileDetails.vue             |  0
 .../assetManager/partials/tile/TileList.vue   |  0
 .../gameMaster/mapEditor/MapEditor.vue        | 18 +++++++-------
 .../mapEditor/mapPartials/MapEventTiles.vue   |  0
 .../mapEditor/mapPartials/MapTiles.vue        |  0
 .../mapEditor/mapPartials/PlacedMapObject.vue |  0
 .../mapPartials/PlacedMapObjects.vue          |  4 ++--
 .../mapEditor/partials/CreateMap.vue          |  0
 .../gameMaster/mapEditor/partials/MapList.vue |  2 +-
 .../mapEditor/partials/MapObjectList.vue      |  0
 .../mapEditor/partials/MapSettings.vue        |  0
 .../partials/SelectedPlacedMapObject.vue      |  0
 .../mapEditor/partials/TeleportModal.vue      |  0
 .../mapEditor/partials/TileList.vue           |  0
 .../gameMaster/mapEditor/partials/Toolbar.vue |  0
 src/components/screens/MapEditor.vue          |  2 +-
 src/composables/characterComposable.ts        |  0
 src/composables/gameComposable.ts             |  7 +++---
 src/composables/mapComposable.ts              |  6 ++---
 src/composables/spriteComposable.ts           |  0
 34 files changed, 34 insertions(+), 35 deletions(-)
 rename src/components/{game => }/gameMaster/GmPanel.vue (93%)
 rename src/components/{game => }/gameMaster/assetManager/AssetManager.vue (77%)
 rename src/components/{game => }/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue (100%)
 rename src/components/{game => }/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue (100%)
 rename src/components/{game => }/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue (100%)
 rename src/components/{game => }/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue (100%)
 rename src/components/{game => }/gameMaster/assetManager/partials/item/itemDetails.vue (100%)
 rename src/components/{game => }/gameMaster/assetManager/partials/item/itemList.vue (100%)
 rename src/components/{game => }/gameMaster/assetManager/partials/mapObject/MapObjectDetails.vue (100%)
 rename src/components/{game => }/gameMaster/assetManager/partials/mapObject/MapObjectList.vue (100%)
 rename src/components/{game => }/gameMaster/assetManager/partials/sprite/SpriteDetails.vue (98%)
 rename src/components/{game => }/gameMaster/assetManager/partials/sprite/SpriteList.vue (100%)
 rename src/components/{game => }/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue (100%)
 rename src/components/{game => }/gameMaster/assetManager/partials/tile/TileDetails.vue (100%)
 rename src/components/{game => }/gameMaster/assetManager/partials/tile/TileList.vue (100%)
 rename src/components/{game => }/gameMaster/mapEditor/MapEditor.vue (71%)
 rename src/components/{game => }/gameMaster/mapEditor/mapPartials/MapEventTiles.vue (100%)
 rename src/components/{game => }/gameMaster/mapEditor/mapPartials/MapTiles.vue (100%)
 rename src/components/{game => }/gameMaster/mapEditor/mapPartials/PlacedMapObject.vue (100%)
 rename src/components/{game => }/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue (97%)
 rename src/components/{game => }/gameMaster/mapEditor/partials/CreateMap.vue (100%)
 rename src/components/{game => }/gameMaster/mapEditor/partials/MapList.vue (96%)
 rename src/components/{game => }/gameMaster/mapEditor/partials/MapObjectList.vue (100%)
 rename src/components/{game => }/gameMaster/mapEditor/partials/MapSettings.vue (100%)
 rename src/components/{game => }/gameMaster/mapEditor/partials/SelectedPlacedMapObject.vue (100%)
 rename src/components/{game => }/gameMaster/mapEditor/partials/TeleportModal.vue (100%)
 rename src/components/{game => }/gameMaster/mapEditor/partials/TileList.vue (100%)
 rename src/components/{game => }/gameMaster/mapEditor/partials/Toolbar.vue (100%)
 delete mode 100644 src/composables/characterComposable.ts
 delete mode 100644 src/composables/spriteComposable.ts

diff --git a/src/App.vue b/src/App.vue
index 8af1e4b..9b9864d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script setup lang="ts">
-import GmPanel from '@/components/game/gameMaster/GmPanel.vue'
+import GmPanel from '@/components/gameMaster/GmPanel.vue'
 import Characters from '@/components/screens/Characters.vue'
 import Game from '@/components/screens/Game.vue'
 import Loading from '@/components/screens/Loading.vue'
diff --git a/src/components/game/gameMaster/GmPanel.vue b/src/components/gameMaster/GmPanel.vue
similarity index 93%
rename from src/components/game/gameMaster/GmPanel.vue
rename to src/components/gameMaster/GmPanel.vue
index 28e4cf4..0854219 100644
--- a/src/components/game/gameMaster/GmPanel.vue
+++ b/src/components/gameMaster/GmPanel.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script setup lang="ts">
-import AssetManager from '@/components/game/gameMaster/assetManager/AssetManager.vue'
+import AssetManager from '@/components/gameMaster/assetManager/AssetManager.vue'
 import Modal from '@/components/utilities/Modal.vue'
 import { useGameStore } from '@/stores/gameStore'
 import { useMapEditorStore } from '@/stores/mapEditorStore'
diff --git a/src/components/game/gameMaster/assetManager/AssetManager.vue b/src/components/gameMaster/assetManager/AssetManager.vue
similarity index 77%
rename from src/components/game/gameMaster/assetManager/AssetManager.vue
rename to src/components/gameMaster/assetManager/AssetManager.vue
index 9b97649..fc7c2bc 100644
--- a/src/components/game/gameMaster/assetManager/AssetManager.vue
+++ b/src/components/gameMaster/assetManager/AssetManager.vue
@@ -60,18 +60,18 @@
 </template>
 
 <script setup lang="ts">
-import CharacterHairDetails from '@/components/game/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue'
-import CharacterHairList from '@/components/game/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue'
-import CharacterTypeDetails from '@/components/game/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue'
-import CharacterTypeList from '@/components/game/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue'
-import ItemDetails from '@/components/game/gameMaster/assetManager/partials/item/itemDetails.vue'
-import ItemList from '@/components/game/gameMaster/assetManager/partials/item/itemList.vue'
-import MapObjectDetails from '@/components/game/gameMaster/assetManager/partials/mapObject/MapObjectDetails.vue'
-import MapObjectList from '@/components/game/gameMaster/assetManager/partials/mapObject/MapObjectList.vue'
-import SpriteDetails from '@/components/game/gameMaster/assetManager/partials/sprite/SpriteDetails.vue'
-import SpriteList from '@/components/game/gameMaster/assetManager/partials/sprite/SpriteList.vue'
-import TileDetails from '@/components/game/gameMaster/assetManager/partials/tile/TileDetails.vue'
-import TileList from '@/components/game/gameMaster/assetManager/partials/tile/TileList.vue'
+import CharacterHairDetails from '@/components/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue'
+import CharacterHairList from '@/components/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue'
+import CharacterTypeDetails from '@/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue'
+import CharacterTypeList from '@/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue'
+import ItemDetails from '@/components/gameMaster/assetManager/partials/item/itemDetails.vue'
+import ItemList from '@/components/gameMaster/assetManager/partials/item/itemList.vue'
+import MapObjectDetails from '@/components/gameMaster/assetManager/partials/mapObject/MapObjectDetails.vue'
+import MapObjectList from '@/components/gameMaster/assetManager/partials/mapObject/MapObjectList.vue'
+import SpriteDetails from '@/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue'
+import SpriteList from '@/components/gameMaster/assetManager/partials/sprite/SpriteList.vue'
+import TileDetails from '@/components/gameMaster/assetManager/partials/tile/TileDetails.vue'
+import TileList from '@/components/gameMaster/assetManager/partials/tile/TileList.vue'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { ref } from 'vue'
 
diff --git a/src/components/game/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue b/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue
similarity index 100%
rename from src/components/game/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue
rename to src/components/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue
diff --git a/src/components/game/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue b/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue
similarity index 100%
rename from src/components/game/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue
rename to src/components/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue
diff --git a/src/components/game/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue b/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue
similarity index 100%
rename from src/components/game/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue
rename to src/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue
diff --git a/src/components/game/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue b/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue
similarity index 100%
rename from src/components/game/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue
rename to src/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue
diff --git a/src/components/game/gameMaster/assetManager/partials/item/itemDetails.vue b/src/components/gameMaster/assetManager/partials/item/itemDetails.vue
similarity index 100%
rename from src/components/game/gameMaster/assetManager/partials/item/itemDetails.vue
rename to src/components/gameMaster/assetManager/partials/item/itemDetails.vue
diff --git a/src/components/game/gameMaster/assetManager/partials/item/itemList.vue b/src/components/gameMaster/assetManager/partials/item/itemList.vue
similarity index 100%
rename from src/components/game/gameMaster/assetManager/partials/item/itemList.vue
rename to src/components/gameMaster/assetManager/partials/item/itemList.vue
diff --git a/src/components/game/gameMaster/assetManager/partials/mapObject/MapObjectDetails.vue b/src/components/gameMaster/assetManager/partials/mapObject/MapObjectDetails.vue
similarity index 100%
rename from src/components/game/gameMaster/assetManager/partials/mapObject/MapObjectDetails.vue
rename to src/components/gameMaster/assetManager/partials/mapObject/MapObjectDetails.vue
diff --git a/src/components/game/gameMaster/assetManager/partials/mapObject/MapObjectList.vue b/src/components/gameMaster/assetManager/partials/mapObject/MapObjectList.vue
similarity index 100%
rename from src/components/game/gameMaster/assetManager/partials/mapObject/MapObjectList.vue
rename to src/components/gameMaster/assetManager/partials/mapObject/MapObjectList.vue
diff --git a/src/components/game/gameMaster/assetManager/partials/sprite/SpriteDetails.vue b/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue
similarity index 98%
rename from src/components/game/gameMaster/assetManager/partials/sprite/SpriteDetails.vue
rename to src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue
index 3b9107b..f11d55a 100644
--- a/src/components/game/gameMaster/assetManager/partials/sprite/SpriteDetails.vue
+++ b/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue
@@ -71,7 +71,7 @@
 <script setup lang="ts">
 import type { Sprite, SpriteAction } from '@/application/types'
 import { uuidv4 } from '@/application/utilities'
-import SpriteActionsInput from '@/components/game/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue'
+import SpriteActionsInput from '@/components/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue'
 import Accordion from '@/components/utilities/Accordion.vue'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useGameStore } from '@/stores/gameStore'
diff --git a/src/components/game/gameMaster/assetManager/partials/sprite/SpriteList.vue b/src/components/gameMaster/assetManager/partials/sprite/SpriteList.vue
similarity index 100%
rename from src/components/game/gameMaster/assetManager/partials/sprite/SpriteList.vue
rename to src/components/gameMaster/assetManager/partials/sprite/SpriteList.vue
diff --git a/src/components/game/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue b/src/components/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue
similarity index 100%
rename from src/components/game/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue
rename to src/components/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue
diff --git a/src/components/game/gameMaster/assetManager/partials/tile/TileDetails.vue b/src/components/gameMaster/assetManager/partials/tile/TileDetails.vue
similarity index 100%
rename from src/components/game/gameMaster/assetManager/partials/tile/TileDetails.vue
rename to src/components/gameMaster/assetManager/partials/tile/TileDetails.vue
diff --git a/src/components/game/gameMaster/assetManager/partials/tile/TileList.vue b/src/components/gameMaster/assetManager/partials/tile/TileList.vue
similarity index 100%
rename from src/components/game/gameMaster/assetManager/partials/tile/TileList.vue
rename to src/components/gameMaster/assetManager/partials/tile/TileList.vue
diff --git a/src/components/game/gameMaster/mapEditor/MapEditor.vue b/src/components/gameMaster/mapEditor/MapEditor.vue
similarity index 71%
rename from src/components/game/gameMaster/mapEditor/MapEditor.vue
rename to src/components/gameMaster/mapEditor/MapEditor.vue
index 2f323f6..2d0d69a 100644
--- a/src/components/game/gameMaster/mapEditor/MapEditor.vue
+++ b/src/components/gameMaster/mapEditor/MapEditor.vue
@@ -15,15 +15,15 @@
 
 <script setup lang="ts">
 import { type Map } from '@/application/types'
-import MapEventTiles from '@/components/game/gameMaster/mapEditor/mapPartials/MapEventTiles.vue'
-import MapTiles from '@/components/game/gameMaster/mapEditor/mapPartials/MapTiles.vue'
-import PlacedMapObjects from '@/components/game/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue'
-import MapList from '@/components/game/gameMaster/mapEditor/partials/MapList.vue'
-import ObjectList from '@/components/game/gameMaster/mapEditor/partials/MapObjectList.vue'
-import MapSettings from '@/components/game/gameMaster/mapEditor/partials/MapSettings.vue'
-import TeleportModal from '@/components/game/gameMaster/mapEditor/partials/TeleportModal.vue'
-import TileList from '@/components/game/gameMaster/mapEditor/partials/TileList.vue'
-import Toolbar from '@/components/game/gameMaster/mapEditor/partials/Toolbar.vue'
+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 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 { useGameStore } from '@/stores/gameStore'
 import { useMapEditorStore } from '@/stores/mapEditorStore'
 import { onUnmounted, shallowRef } from 'vue'
diff --git a/src/components/game/gameMaster/mapEditor/mapPartials/MapEventTiles.vue b/src/components/gameMaster/mapEditor/mapPartials/MapEventTiles.vue
similarity index 100%
rename from src/components/game/gameMaster/mapEditor/mapPartials/MapEventTiles.vue
rename to src/components/gameMaster/mapEditor/mapPartials/MapEventTiles.vue
diff --git a/src/components/game/gameMaster/mapEditor/mapPartials/MapTiles.vue b/src/components/gameMaster/mapEditor/mapPartials/MapTiles.vue
similarity index 100%
rename from src/components/game/gameMaster/mapEditor/mapPartials/MapTiles.vue
rename to src/components/gameMaster/mapEditor/mapPartials/MapTiles.vue
diff --git a/src/components/game/gameMaster/mapEditor/mapPartials/PlacedMapObject.vue b/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObject.vue
similarity index 100%
rename from src/components/game/gameMaster/mapEditor/mapPartials/PlacedMapObject.vue
rename to src/components/gameMaster/mapEditor/mapPartials/PlacedMapObject.vue
diff --git a/src/components/game/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue b/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
similarity index 97%
rename from src/components/game/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
rename to src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
index dbb8790..f08b1ea 100644
--- a/src/components/game/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
+++ b/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
@@ -6,8 +6,8 @@
 <script setup lang="ts">
 import type { PlacedMapObject as PlacedMapObjectT } from '@/application/types'
 import { uuidv4 } from '@/application/utilities'
-import PlacedMapObject from '@/components/game/gameMaster/mapEditor/mapPartials/PlacedMapObject.vue'
-import SelectedPlacedMapObjectComponent from '@/components/game/gameMaster/mapEditor/partials/SelectedPlacedMapObject.vue'
+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 { useScene } from 'phavuer'
diff --git a/src/components/game/gameMaster/mapEditor/partials/CreateMap.vue b/src/components/gameMaster/mapEditor/partials/CreateMap.vue
similarity index 100%
rename from src/components/game/gameMaster/mapEditor/partials/CreateMap.vue
rename to src/components/gameMaster/mapEditor/partials/CreateMap.vue
diff --git a/src/components/game/gameMaster/mapEditor/partials/MapList.vue b/src/components/gameMaster/mapEditor/partials/MapList.vue
similarity index 96%
rename from src/components/game/gameMaster/mapEditor/partials/MapList.vue
rename to src/components/gameMaster/mapEditor/partials/MapList.vue
index f4d8dc8..51bb699 100644
--- a/src/components/game/gameMaster/mapEditor/partials/MapList.vue
+++ b/src/components/gameMaster/mapEditor/partials/MapList.vue
@@ -27,7 +27,7 @@
 
 <script setup lang="ts">
 import type { Map, UUID } from '@/application/types'
-import CreateMap from '@/components/game/gameMaster/mapEditor/partials/CreateMap.vue'
+import CreateMap from '@/components/gameMaster/mapEditor/partials/CreateMap.vue'
 import Modal from '@/components/utilities/Modal.vue'
 import { useGameStore } from '@/stores/gameStore'
 import { useMapEditorStore } from '@/stores/mapEditorStore'
diff --git a/src/components/game/gameMaster/mapEditor/partials/MapObjectList.vue b/src/components/gameMaster/mapEditor/partials/MapObjectList.vue
similarity index 100%
rename from src/components/game/gameMaster/mapEditor/partials/MapObjectList.vue
rename to src/components/gameMaster/mapEditor/partials/MapObjectList.vue
diff --git a/src/components/game/gameMaster/mapEditor/partials/MapSettings.vue b/src/components/gameMaster/mapEditor/partials/MapSettings.vue
similarity index 100%
rename from src/components/game/gameMaster/mapEditor/partials/MapSettings.vue
rename to src/components/gameMaster/mapEditor/partials/MapSettings.vue
diff --git a/src/components/game/gameMaster/mapEditor/partials/SelectedPlacedMapObject.vue b/src/components/gameMaster/mapEditor/partials/SelectedPlacedMapObject.vue
similarity index 100%
rename from src/components/game/gameMaster/mapEditor/partials/SelectedPlacedMapObject.vue
rename to src/components/gameMaster/mapEditor/partials/SelectedPlacedMapObject.vue
diff --git a/src/components/game/gameMaster/mapEditor/partials/TeleportModal.vue b/src/components/gameMaster/mapEditor/partials/TeleportModal.vue
similarity index 100%
rename from src/components/game/gameMaster/mapEditor/partials/TeleportModal.vue
rename to src/components/gameMaster/mapEditor/partials/TeleportModal.vue
diff --git a/src/components/game/gameMaster/mapEditor/partials/TileList.vue b/src/components/gameMaster/mapEditor/partials/TileList.vue
similarity index 100%
rename from src/components/game/gameMaster/mapEditor/partials/TileList.vue
rename to src/components/gameMaster/mapEditor/partials/TileList.vue
diff --git a/src/components/game/gameMaster/mapEditor/partials/Toolbar.vue b/src/components/gameMaster/mapEditor/partials/Toolbar.vue
similarity index 100%
rename from src/components/game/gameMaster/mapEditor/partials/Toolbar.vue
rename to src/components/gameMaster/mapEditor/partials/Toolbar.vue
diff --git a/src/components/screens/MapEditor.vue b/src/components/screens/MapEditor.vue
index 5064cdb..5b7e06c 100644
--- a/src/components/screens/MapEditor.vue
+++ b/src/components/screens/MapEditor.vue
@@ -11,7 +11,7 @@
 <script setup lang="ts">
 import config from '@/application/config'
 import 'phaser'
-import MapEditor from '@/components/game/gameMaster/mapEditor/MapEditor.vue'
+import MapEditor from '@/components/gameMaster/mapEditor/MapEditor.vue'
 import { useGameStore } from '@/stores/gameStore'
 import { useMapEditorStore } from '@/stores/mapEditorStore'
 import { Game, Scene } from 'phavuer'
diff --git a/src/composables/characterComposable.ts b/src/composables/characterComposable.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/src/composables/gameComposable.ts b/src/composables/gameComposable.ts
index 77a5c94..1762dbe 100644
--- a/src/composables/gameComposable.ts
+++ b/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,7 +57,7 @@ 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
 
   // @TODO: Fix this
   const spriteStorage = new SpriteStorage()
@@ -66,7 +65,7 @@ export async function loadSpriteTextures(scene: Phaser.Scene, sprite_id: string)
 
   if (!sprite) {
     console.error('Failed to load sprite:', sprite_id)
-    return
+    return false
   }
 
   for await (const sprite_action of sprite.spriteActions) {
@@ -100,5 +99,5 @@ export async function loadSpriteTextures(scene: Phaser.Scene, sprite_id: string)
       repeat: -1
     })
   }
-  return Promise.resolve(true)
+  return true
 }
diff --git a/src/composables/mapComposable.ts b/src/composables/mapComposable.ts
index 3fd61a6..52baf64 100644
--- a/src/composables/mapComposable.ts
+++ b/src/composables/mapComposable.ts
@@ -9,9 +9,9 @@ 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
+export function getTile(layer: TilemapLayer | Tilemap, positionX: number, positionY: number): Tile | null {
+  const tile = layer?.getTileAtWorldXY(positionX, positionY)
+  if (!tile) return null
   return tile
 }
 
diff --git a/src/composables/spriteComposable.ts b/src/composables/spriteComposable.ts
deleted file mode 100644
index e69de29..0000000