imshvc/noxious_client
1
0
Fork 0
forked from noxious/client
Code Pull Requests Activity

Small cleanup

Browse Source
This commit is contained in:
Dennis Postma 2024-10-27 18:50:13 +01:00
parent 4f8517a50c
commit 4aa1309797
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/zone/Zone.vue
View File

@ -13,8 +13,7 @@ import type { Character as CharacterT, Zone as ZoneT, ExtendedCharacter as Exten
import ZoneTiles from '@/components/zone/ZoneTiles.vue'
import ZoneObjects from '@/components/zone/ZoneObjects.vue'
import Characters from '@/components/zone/Characters.vue'
import { unduplicateArray } from '@/utilities'
import { FlattenZoneArray, loadZoneTileTexture } from '@/composables/zoneComposable'
import { loadZoneTiles } from '@/composables/zoneComposable'
const scene = useScene()
const gameStore = useGameStore()
@ -37,6 +36,7 @@ gameStore.connection!.on('zone:character:teleport', async (data: zoneLoadData) =
zoneId: data.zone.id
})
await loadZoneTiles(response.zone, scene)
zoneStore.setZone(data.zone)
zoneStore.setCharacters(data.characters)
})
@ -55,13 +55,6 @@ gameStore.connection!.on('character:move', (data: ExtendedCharacterT) => {
zoneStore.updateCharacter(data)
})
async function loadZoneTiles(zone: ZoneT, scene: Phaser.Scene) {
const tileArray = unduplicateArray(FlattenZoneArray(zone.tiles))
for (const tile of tileArray) {
await loadZoneTileTexture(scene, tile, new Date())
}
}
onMounted(async () => {
// Emit zone:character:join event to server and wait for response, then set zone and characters
gameStore!.connection!.emit('zone:character:join', async (response: zoneLoadData) => {

2
src/components/zone/ZoneTiles.vue
View File

@ -7,7 +7,7 @@ import config from '@/config'
import { useScene } from 'phavuer'
import { useZoneStore } from '@/stores/zoneStore'
import { onBeforeUnmount } from 'vue'
import { setLayerTiles, loadZoneTileTexture } from '@/composables/zoneComposable'
import { setLayerTiles } from '@/composables/zoneComposable'
import Controls from '@/components/utilities/Controls.vue'
const emit = defineEmits(['tilemap:create'])

9
src/composables/zoneComposable.ts
View File

@ -4,6 +4,8 @@ import TilemapLayer = Phaser.Tilemaps.TilemapLayer
import Tileset = Phaser.Tilemaps.Tileset
import Tile = Phaser.Tilemaps.Tile
import { useAssetManager } from '@/managers/assetManager'
import type { Zone as ZoneT } from '@/types'
import { unduplicateArray } from '@/utilities'
export function getTile(layer: TilemapLayer | Tilemap, x: number, y: number): Tile | undefined {
const tile = layer.getTileAtWorldXY(x, y)
@ -83,6 +85,13 @@ export function FlattenZoneArray(tiles: string[][]) {
return normalArray
}
export async function loadZoneTiles(zone: ZoneT, scene: Phaser.Scene) {
const tileArray = unduplicateArray(FlattenZoneArray(zone.tiles))
for (const tile of tileArray) {
await loadZoneTileTexture(scene, tile, new Date())
}
}
export async function loadZoneTileTexture(scene: Phaser.Scene, textureId: string, updatedAt: Date): Promise<boolean> {
const assetManager = useAssetManager