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

My 13th reason (2.0)

Browse Source
This commit is contained in:
Dennis Postma
2024-09-20 16:34:17 +02:00
parent b9bb55cf49
commit be4c201d81
21 changed files with 129 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
<script setup lang="ts">
import Character from '@/components/sprites/Character.vue'
import { useZoneStore } from '@/stores/zone'
import { calculateIsometricDepth } from '@/services/zone'
import { calculateIsometricDepth } from '@/composables/zoneComposable'
const zoneStore = useZoneStore()

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

@ -4,7 +4,7 @@
</template>
<script setup lang="ts">
import { calculateIsometricDepth, tileToWorldX, tileToWorldY } from '@/services/zone'
import { calculateIsometricDepth, tileToWorldX, tileToWorldY } from '@/composables/zoneComposable'
import { Image, Text } from 'phavuer'
import { useZoneStore } from '@/stores/zone'
import type { ZoneObject } from '@/types'

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

@ -8,7 +8,7 @@ import { useScene } from 'phavuer'
import { useZoneStore } from '@/stores/zone'
import { onBeforeMount, onBeforeUnmount, ref } from 'vue'
import { storeToRefs } from 'pinia'
import { placeTile, setAllTiles } from '@/services/zone'
import { placeTile, setAllTiles } from '@/composables/zoneComposable'
import Controls from '@/components/utilities/Controls.vue'
const emit = defineEmits(['tilemap:create'])

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

@ -5,21 +5,18 @@
</template>
<script setup lang="ts">
import { useGame, useScene } from 'phavuer'
import { useAssetStore } from '@/stores/assets'
import { useScene } from 'phavuer'
import { useGameStore } from '@/stores/game'
import { useZoneStore } from '@/stores/zone'
import { onBeforeMount, onBeforeUnmount, ref, watch } from 'vue'
import { onBeforeUnmount, ref } from 'vue'
import type { Character as CharacterT, Zone as ZoneT, ExtendedCharacter as ExtendedCharacterT } from '@/types'
import Tiles from '@/components/zone/Tiles.vue'
import Objects from '@/components/zone/Objects.vue'
import Characters from '@/components/zone/Characters.vue'
import { loadAssets } from '@/services/zone'
import { loadAssets } from '@/composables/zoneComposable'
const assetStore = useAssetStore()
const gameStore = useGameStore()
const zoneStore = useZoneStore()
const game = useGame()
const scene = useScene()
const tileMap = ref(null as Phaser.Tilemaps.Tilemap | null)
@ -29,15 +26,25 @@ type zoneLoadData = {
characters: CharacterT[]
}
gameStore.connection?.emit('zone:character:join', { zoneId: gameStore.character!.zoneId }, (response: zoneLoadData) => {
gameStore.connection!.emit('zone:character:join', { zoneId: gameStore.character!.zoneId }, async (response: zoneLoadData) => {
// Fetch assets for new zone
await gameStore.fetchZoneAssets(response.zone.id)
await loadAssets(scene)
// Set zone and characters
zoneStore.setZone(response.zone)
zoneStore.setCharacters(response.characters)
})
// Event listeners
gameStore.connection?.on('zone:teleport', (data: zoneLoadData) => {
gameStore.connection!.on('zone:teleport', async (data: zoneLoadData) => {
if (zoneStore.zone?.id === data.zone.id) return
// Fetch assets for new zone
await gameStore.fetchZoneAssets(data.zone.id)
// wait 1.5 sec
await loadAssets(scene)
/**
* @TODO : Update character via global event server-side, remove this and listen for it somewhere not here
*/
@ -50,23 +57,23 @@ gameStore.connection?.on('zone:teleport', (data: zoneLoadData) => {
zoneStore.setCharacters(data.characters)
})
gameStore.connection?.on('zone:character:join', async (data: ExtendedCharacterT) => {
gameStore.connection!.on('zone:character:join', async (data: ExtendedCharacterT) => {
zoneStore.addCharacter(data)
})
gameStore.connection?.on('zone:character:leave', (character_id: number) => {
gameStore.connection!.on('zone:character:leave', (character_id: number) => {
zoneStore.removeCharacter(character_id)
})
gameStore.connection?.on('character:move', (data: ExtendedCharacterT) => {
gameStore.connection!.on('character:move', (data: ExtendedCharacterT) => {
zoneStore.updateCharacter(data)
})
onBeforeUnmount(() => {
zoneStore.reset()
gameStore.connection?.off('zone:teleport')
gameStore.connection?.off('zone:character:join')
gameStore.connection?.off('zone:character:leave')
gameStore.connection?.off('character:move')
gameStore.connection!.off('zone:teleport')
gameStore.connection!.off('zone:character:join')
gameStore.connection!.off('zone:character:leave')
gameStore.connection!.off('character:move')
})
</script>