npm run frmat
This commit is contained in:
parent
5a40fb4734
commit
2101d20835
@ -46,7 +46,7 @@ export default class ObjectUploadEvent {
|
||||
originX: 0,
|
||||
originY: 0,
|
||||
frameWidth: width,
|
||||
frameHeight: height,
|
||||
frameHeight: height
|
||||
}
|
||||
})
|
||||
|
||||
|
@ -27,16 +27,14 @@ class ZoneManager {
|
||||
}
|
||||
|
||||
public async getZoneAssets(zone: Zone): Promise<ZoneAssets> {
|
||||
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<T>(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`)
|
||||
}
|
||||
|
||||
|
@ -32,7 +32,7 @@ class LoadedZone {
|
||||
}
|
||||
})
|
||||
|
||||
console.log(grid);
|
||||
console.log(grid)
|
||||
return grid
|
||||
}
|
||||
|
||||
|
@ -63,13 +63,13 @@ class ZoneRepository {
|
||||
|
||||
async getEventTeleportTiles(id: number): Promise<ZoneEventTileWithTeleport[]> {
|
||||
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 []
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user