noxious/client
6
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feature/map-refactor

Browse Source
This commit is contained in:
Dennis Postma
2025-02-14 02:08:23 +01:00
parent 8b0bf6534e 579749f4e0
commit f83e2bf8c8
36 changed files with 754 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/composables/controls/useGameControlsComposable.ts
View File

@ -1,3 +1,4 @@
import { SocketEvent } from '@/application/enums'
import { getTile } from '@/services/mapService'
import { useGameStore } from '@/stores/gameStore'
import type { Ref } from 'vue'
@ -22,7 +23,7 @@ export function useGameControlsComposable(scene: Phaser.Scene, layer: Phaser.Til
const pointerTile = getTile(layer, pointer.worldX, pointer.worldY)
if (!pointerTile) return
gameStore.connection?.emit('map:character:move', {
gameStore.connection?.emit(SocketEvent.MAP_CHARACTER_MOVE, {
positionX: pointerTile.x,
positionY: pointerTile.y
})
@ -37,7 +38,7 @@ export function useGameControlsComposable(scene: Phaser.Scene, layer: Phaser.Til
if (['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'].includes(event.key)) {
// Prevent key repeat events
if (event.repeat) return
pressedKeys.add(event.key)
// Start movement loop if not already running
@ -49,7 +50,7 @@ export function useGameControlsComposable(scene: Phaser.Scene, layer: Phaser.Til
// Attack on CTRL
if (event.key === 'Control') {
gameStore.connection?.emit('map:character:attack')
gameStore.connection?.emit(SocketEvent.MAP_CHARACTER_ATTACK)
}
}
@ -65,9 +66,6 @@ export function useGameControlsComposable(scene: Phaser.Scene, layer: Phaser.Til
function moveCharacter() {
if (!gameStore.character) return
// Don't allow movement while attacking
if (gameStore.character.isAttacking) return
const { positionX, positionY } = gameStore.character
let newX = positionX
@ -81,7 +79,7 @@ export function useGameControlsComposable(scene: Phaser.Scene, layer: Phaser.Til
// Only emit if position changed
if (newX !== positionX || newY !== positionY) {
gameStore.connection?.emit('map:character:move', {
gameStore.connection?.emit(SocketEvent.MAP_CHARACTER_MOVE, {
positionX: newX,
positionY: newY
})

2
src/composables/useCharacterSpriteComposable.ts
View File

@ -18,7 +18,7 @@ export function useCharacterSpriteComposable(scene: Phaser.Scene, tilemap: Phase
const tween = ref<Phaser.Tweens.Tween | null>(null)
const updateIsometricDepth = (positionX: number, positionY: number) => {
isometricDepth.value = calculateIsometricDepth(positionX, positionY, 30, 95, true)
isometricDepth.value = calculateIsometricDepth(positionX, positionY, 30, 95)
}
const updatePosition = (positionX: number, positionY: number) => {