diff --git a/src/components/utilities/Controls.vue b/src/components/utilities/Controls.vue
index 83a3345..b924bfc 100644
--- a/src/components/utilities/Controls.vue
+++ b/src/components/utilities/Controls.vue
@@ -32,21 +32,13 @@ const { setupPointerHandlers, cleanupPointerHandlers } = usePointerHandlers(scen
function handleScrollZoom(pointer: Phaser.Input.Pointer) {
if (!(pointer.event instanceof WheelEvent && pointer.event.shiftKey)) return
- const zoomLevel = Phaser.Math.Clamp(
- camera.zoom - pointer.event.deltaY * ZOOM_SETTINGS.WHEEL_FACTOR,
- ZOOM_SETTINGS.MIN,
- ZOOM_SETTINGS.MAX
- )
+ const zoomLevel = Phaser.Math.Clamp(camera.zoom - pointer.event.deltaY * ZOOM_SETTINGS.WHEEL_FACTOR, ZOOM_SETTINGS.MIN, ZOOM_SETTINGS.MAX)
camera.setZoom(zoomLevel)
}
function handleKeyComboZoom(event: { keyCodes: number[] }) {
const deltaY = event.keyCodes[1] === 38 ? 1 : -1 // 38 is Up, 40 is Down
- const zoomLevel = Phaser.Math.Clamp(
- camera.zoom + deltaY * ZOOM_SETTINGS.KEY_FACTOR,
- ZOOM_SETTINGS.MIN,
- ZOOM_SETTINGS.MAX
- )
+ const zoomLevel = Phaser.Math.Clamp(camera.zoom + deltaY * ZOOM_SETTINGS.KEY_FACTOR, ZOOM_SETTINGS.MIN, ZOOM_SETTINGS.MAX)
camera.setZoom(zoomLevel)
}
@@ -63,4 +55,4 @@ onBeforeUnmount(() => {
scene.input.keyboard?.off('keycombomatch')
scene.input.off(Phaser.Input.Events.POINTER_WHEEL, handleScrollZoom)
})
-
\ No newline at end of file
+
diff --git a/src/composables/gameComposable.ts b/src/composables/gameComposable.ts
index f5f5787..fcfe1c8 100644
--- a/src/composables/gameComposable.ts
+++ b/src/composables/gameComposable.ts
@@ -61,8 +61,9 @@ export async function loadSpriteTextures(scene: Phaser.Scene, sprite: Sprite) {
// @TODO: Fix this
const sprite_actions: HttpResponse
= await fetch(config.server_endpoint + '/assets/list_sprite_actions/' + sprite?.id).then((response) => response.json())
-
+
for await (const sprite_action of sprite_actions.data ?? []) {
+ console.log(sprite_action)
await loadTexture(scene, {
key: sprite_action.key,
data: sprite_action.data,
@@ -73,7 +74,7 @@ export async function loadSpriteTextures(scene: Phaser.Scene, sprite: Sprite) {
isAnimated: sprite_action.isAnimated,
frameWidth: sprite_action.frameWidth,
frameHeight: sprite_action.frameHeight,
- frameRate: sprite_action.frameRate,
+ frameRate: sprite_action.frameRate
} as AssetDataT)
// If the sprite is not animated, skip
@@ -88,7 +89,7 @@ export async function loadSpriteTextures(scene: Phaser.Scene, sprite: Sprite) {
scene.anims.create({
key: sprite_action.key,
frameRate: sprite_action.frameRate,
- frames: scene.anims.generateFrameNumbers(sprite_action.key, { start: 0, end: sprite_action.frameRate! - 1 }),
+ frames: scene.anims.generateFrameNumbers(sprite_action.key, { start: 0, end: sprite_action.frameCount! - 1 }),
repeat: -1
})
}
diff --git a/src/services/authentication.ts b/src/services/authentication.ts
index 2ed37a7..035d761 100644
--- a/src/services/authentication.ts
+++ b/src/services/authentication.ts
@@ -6,8 +6,10 @@ import { getDomain } from '@/application/utilities'
export async function register(username: string, email: string, password: string) {
try {
const response = await axios.post(`${config.server_endpoint}/register`, { username, email, password })
- useCookies().set('token', response.data.data.token as string)
- return { success: true, token: response.data.data.token }
+ if (response.status === 200) {
+ return { success: true }
+ }
+ return { error: response.data.message }
} catch (error: any) {
if (typeof error.response?.data === 'undefined') {
return { error: 'Could not connect to server' }
diff --git a/src/storage/assetStorage.ts b/src/storage/assetStorage.ts
index afe2095..54b4304 100644
--- a/src/storage/assetStorage.ts
+++ b/src/storage/assetStorage.ts
@@ -33,9 +33,10 @@ export class AssetStorage {
originX: asset.originX,
originY: asset.originY,
isAnimated: asset.isAnimated,
+ frameRate: asset.frameRate,
frameWidth: asset.frameWidth,
frameHeight: asset.frameHeight,
- frameRate: asset.frameRate
+ frameCount: asset.frameCount
})
} catch (error) {
console.error(`Failed to add asset ${asset.key}:`, error)
diff --git a/src/stores/zoneStore.ts b/src/stores/zoneStore.ts
index 67552e7..ce66218 100644
--- a/src/stores/zoneStore.ts
+++ b/src/stores/zoneStore.ts
@@ -40,10 +40,10 @@ export const useZoneStore = defineStore('zone', {
setCharacterLoaded(loaded: boolean) {
this.characterLoaded = loaded
},
- updateCharacterPosition(data: { id: number, positionX: number, positionY: number, rotation: number, isMoving: boolean }) {
- const character = this.characters.find(char => char.character.id === data.id)
+ updateCharacterPosition(data: { id: number; positionX: number; positionY: number; rotation: number; isMoving: boolean }) {
+ const character = this.characters.find((char) => char.character.id === data.id)
if (character) {
- character.character.positionX= data.positionX
+ character.character.positionX = data.positionX
character.character.positionY = data.positionY
character.character.rotation = data.rotation
character.isMoving = data.isMoving