From 2101d20835201dc37b7c9f0942ff7df42092d4cc Mon Sep 17 00:00:00 2001 From: Dennis Postma Date: Fri, 20 Sep 2024 12:34:34 +0200 Subject: [PATCH] npm run frmat --- src/events/chat/gameMaster/teleportCommand.ts | 2 +- .../gameMaster/assetManager/object/upload.ts | 4 +-- src/managers/zoneManager.ts | 14 ++++----- src/models/loadedZone.ts | 2 +- src/repositories/zoneRepository.ts | 4 +-- src/utilities/http.ts | 30 +++++++++---------- 6 files changed, 27 insertions(+), 29 deletions(-) diff --git a/src/events/chat/gameMaster/teleportCommand.ts b/src/events/chat/gameMaster/teleportCommand.ts index 3caea9e..4f3f5a0 100644 --- a/src/events/chat/gameMaster/teleportCommand.ts +++ b/src/events/chat/gameMaster/teleportCommand.ts @@ -79,4 +79,4 @@ export default class TeleportCommandEvent { this.socket.emit('notification', { title: 'Server message', message: 'An error occurred while teleporting' }) } } -} \ No newline at end of file +} diff --git a/src/events/gameMaster/assetManager/object/upload.ts b/src/events/gameMaster/assetManager/object/upload.ts index cd5a8e4..5b5e7b8 100644 --- a/src/events/gameMaster/assetManager/object/upload.ts +++ b/src/events/gameMaster/assetManager/object/upload.ts @@ -46,7 +46,7 @@ export default class ObjectUploadEvent { originX: 0, originY: 0, frameWidth: width, - frameHeight: height, + frameHeight: height } }) @@ -66,4 +66,4 @@ export default class ObjectUploadEvent { callback(false) } } -} \ No newline at end of file +} diff --git a/src/managers/zoneManager.ts b/src/managers/zoneManager.ts index 7d2a808..4a8e8ee 100644 --- a/src/managers/zoneManager.ts +++ b/src/managers/zoneManager.ts @@ -27,16 +27,14 @@ class ZoneManager { } public async getZoneAssets(zone: Zone): Promise { - const tiles: string[] = this.getUnique( - (JSON.parse(JSON.stringify(zone.tiles)) as string[][]).reduce((acc, val) => [...acc, ...val]) - ); - const objects = await zoneRepository.getObjects(zone.id); - const mappedObjects = this.getUnique(objects.map(x => x.objectId)); + const tiles: string[] = this.getUnique((JSON.parse(JSON.stringify(zone.tiles)) as string[][]).reduce((acc, val) => [...acc, ...val])) + const objects = await zoneRepository.getObjects(zone.id) + const mappedObjects = this.getUnique(objects.map((x) => x.objectId)) return { tiles: tiles, - objects: mappedObjects, - } as ZoneAssets; + objects: mappedObjects + } as ZoneAssets } private getUnique(array: T[]) { @@ -47,7 +45,7 @@ class ZoneManager { public async loadZone(zone: Zone) { const loadedZone = new LoadedZone(zone) this.loadedZones.push(loadedZone) - await this.getZoneAssets(zone); + await this.getZoneAssets(zone) logger.info(`Zone ID ${zone.id} loaded`) } diff --git a/src/models/loadedZone.ts b/src/models/loadedZone.ts index 3b25c54..6ee48ac 100644 --- a/src/models/loadedZone.ts +++ b/src/models/loadedZone.ts @@ -32,7 +32,7 @@ class LoadedZone { } }) - console.log(grid); + console.log(grid) return grid } diff --git a/src/repositories/zoneRepository.ts b/src/repositories/zoneRepository.ts index 73fda8f..b944b2a 100644 --- a/src/repositories/zoneRepository.ts +++ b/src/repositories/zoneRepository.ts @@ -63,13 +63,13 @@ class ZoneRepository { async getEventTeleportTiles(id: number): Promise { try { - return await prisma.zoneEventTile.findMany({ + return (await prisma.zoneEventTile.findMany({ where: { zoneId: id, type: ZoneEventTileType.TELEPORT }, include: { teleport: true } - }) as unknown as ZoneEventTileWithTeleport[] + })) as unknown as ZoneEventTileWithTeleport[] } catch (error: any) { logger.error(`Failed to get zone event tiles: ${error.message}`) return [] diff --git a/src/utilities/http.ts b/src/utilities/http.ts index 809fd68..f384a52 100644 --- a/src/utilities/http.ts +++ b/src/utilities/http.ts @@ -52,45 +52,45 @@ async function addHttpRoutes(app: Application) { }) app.get('/assets/:zoneId', async (req: Request, res: Response) => { - const zoneId = parseInt(req.params.zoneId); + const zoneId = parseInt(req.params.zoneId) if (isNaN(zoneId) || zoneId === 0) { - return res.status(400).json({ message: 'Invalid zone ID' }); + return res.status(400).json({ message: 'Invalid zone ID' }) } - const zone = await zoneRepository.getById(zoneId); + const zone = await zoneRepository.getById(zoneId) if (!zone) { - return res.status(404).json({ message: 'Zone not found' }); + return res.status(404).json({ message: 'Zone not found' }) } - const assets = await zoneManager.getZoneAssets(zone); - const sprites = await spriteRepository.getAll(); + const assets = await zoneManager.getZoneAssets(zone) + const sprites = await spriteRepository.getAll() - const spritesAssets = sprites.flatMap(sprite => - sprite.spriteActions.map(action => ({ + const spritesAssets = sprites.flatMap((sprite) => + sprite.spriteActions.map((action) => ({ key: `${sprite.id}-${action.action}`, url: `/assets/sprites/${sprite.id}/${action.action}.png`, group: action.isAnimated ? 'sprite_animations' : 'sprites', frameWidth: action.frameWidth, frameHeight: action.frameHeight })) - ); + ) - const tilesAssets = assets.tiles.map(tile => ({ + const tilesAssets = assets.tiles.map((tile) => ({ key: tile, url: `/assets/tiles/${tile}.png`, group: 'tiles' - })); + })) - const objectsAssets = assets.objects.map(object => ({ + const objectsAssets = assets.objects.map((object) => ({ key: object, url: `/assets/objects/${object}.png`, group: 'objects' - })); + })) - res.json([...spritesAssets, ...tilesAssets, ...objectsAssets]); - }); + res.json([...spritesAssets, ...tilesAssets, ...objectsAssets]) + }) app.get('/assets/:type/:spriteId?/:file', (req: Request, res: Response) => { const assetType = req.params.type