Improvements

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'

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'

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'
 

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'

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'

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'

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'

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'

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
 }

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
 }