From 7531385912ad1da2788b12d2c83ae87faa666627 Mon Sep 17 00:00:00 2001 From: Dennis Postma Date: Tue, 23 Jul 2024 00:16:25 +0200 Subject: [PATCH] Finished sprite CRUD in asset manager, removed unused DB field, renamed files for consistency --- .../migration.sql | 8 ++++++++ prisma/schema.prisma | 1 - src/events/gm/object/{GmObjectList.ts => List.ts} | 0 src/events/gm/object/{GmObjectRemove.ts => Remove.ts} | 0 src/events/gm/object/{GmObjectUpdate.ts => Update.ts} | 0 src/events/gm/object/{GmObjectUpload.ts => Upload.ts} | 0 src/events/gm/sprite/Update.ts | 10 +++++++++- src/events/gm/tile/{GmTileList.ts => List.ts} | 0 src/events/gm/tile/{GmTileRemove.ts => Remove.ts} | 0 src/events/gm/tile/{GmTileUpdate.ts => Update.ts} | 0 src/events/gm/tile/{GmTileUpload.ts => Upload.ts} | 0 .../gm/zone/{GmZoneEditorZoneCreate.ts => Create.ts} | 0 .../gm/zone/{GmZoneEditorZoneDelete.ts => Delete.ts} | 0 .../gm/zone/{GmZoneEditorZoneList.ts => List.ts} | 0 .../gm/zone/{GmZoneEditorZoneRequest.ts => Request.ts} | 0 .../gm/zone/{GmZoneEditorZoneUpdate.ts => Update.ts} | 4 ++++ 16 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 prisma/migrations/20240722213348_removed_is_animated_field/migration.sql rename src/events/gm/object/{GmObjectList.ts => List.ts} (100%) rename src/events/gm/object/{GmObjectRemove.ts => Remove.ts} (100%) rename src/events/gm/object/{GmObjectUpdate.ts => Update.ts} (100%) rename src/events/gm/object/{GmObjectUpload.ts => Upload.ts} (100%) rename src/events/gm/tile/{GmTileList.ts => List.ts} (100%) rename src/events/gm/tile/{GmTileRemove.ts => Remove.ts} (100%) rename src/events/gm/tile/{GmTileUpdate.ts => Update.ts} (100%) rename src/events/gm/tile/{GmTileUpload.ts => Upload.ts} (100%) rename src/events/gm/zone/{GmZoneEditorZoneCreate.ts => Create.ts} (100%) rename src/events/gm/zone/{GmZoneEditorZoneDelete.ts => Delete.ts} (100%) rename src/events/gm/zone/{GmZoneEditorZoneList.ts => List.ts} (100%) rename src/events/gm/zone/{GmZoneEditorZoneRequest.ts => Request.ts} (100%) rename src/events/gm/zone/{GmZoneEditorZoneUpdate.ts => Update.ts} (97%) diff --git a/prisma/migrations/20240722213348_removed_is_animated_field/migration.sql b/prisma/migrations/20240722213348_removed_is_animated_field/migration.sql new file mode 100644 index 0000000..1779472 --- /dev/null +++ b/prisma/migrations/20240722213348_removed_is_animated_field/migration.sql @@ -0,0 +1,8 @@ +/* + Warnings: + + - You are about to drop the column `isAnimated` on the `Sprite` table. All the data in the column will be lost. + +*/ +-- AlterTable +ALTER TABLE `Sprite` DROP COLUMN `isAnimated`; diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 8c8bde3..642239d 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -27,7 +27,6 @@ model Sprite { frameSpeed Int @default(0) frameWidth Int @default(0) frameHeight Int @default(0) - isAnimated Boolean @default(false) isLooping Boolean @default(false) createdAt DateTime @default(now()) updatedAt DateTime @updatedAt diff --git a/src/events/gm/object/GmObjectList.ts b/src/events/gm/object/List.ts similarity index 100% rename from src/events/gm/object/GmObjectList.ts rename to src/events/gm/object/List.ts diff --git a/src/events/gm/object/GmObjectRemove.ts b/src/events/gm/object/Remove.ts similarity index 100% rename from src/events/gm/object/GmObjectRemove.ts rename to src/events/gm/object/Remove.ts diff --git a/src/events/gm/object/GmObjectUpdate.ts b/src/events/gm/object/Update.ts similarity index 100% rename from src/events/gm/object/GmObjectUpdate.ts rename to src/events/gm/object/Update.ts diff --git a/src/events/gm/object/GmObjectUpload.ts b/src/events/gm/object/Upload.ts similarity index 100% rename from src/events/gm/object/GmObjectUpload.ts rename to src/events/gm/object/Upload.ts diff --git a/src/events/gm/sprite/Update.ts b/src/events/gm/sprite/Update.ts index add8467..c97242a 100644 --- a/src/events/gm/sprite/Update.ts +++ b/src/events/gm/sprite/Update.ts @@ -7,6 +7,10 @@ type Payload = { name: string origin_x: number origin_y: number + frameSpeed: number + frameWidth: number + frameHeight: number + isLooping: boolean } /** @@ -28,7 +32,11 @@ export default function (socket: TSocket, io: Server) { data: { name: data.name, origin_x: data.origin_x, - origin_y: data.origin_y + origin_y: data.origin_y, + frameSpeed: data.frameSpeed, + frameWidth: data.frameWidth, + frameHeight: data.frameHeight, + isLooping: data.isLooping } }) diff --git a/src/events/gm/tile/GmTileList.ts b/src/events/gm/tile/List.ts similarity index 100% rename from src/events/gm/tile/GmTileList.ts rename to src/events/gm/tile/List.ts diff --git a/src/events/gm/tile/GmTileRemove.ts b/src/events/gm/tile/Remove.ts similarity index 100% rename from src/events/gm/tile/GmTileRemove.ts rename to src/events/gm/tile/Remove.ts diff --git a/src/events/gm/tile/GmTileUpdate.ts b/src/events/gm/tile/Update.ts similarity index 100% rename from src/events/gm/tile/GmTileUpdate.ts rename to src/events/gm/tile/Update.ts diff --git a/src/events/gm/tile/GmTileUpload.ts b/src/events/gm/tile/Upload.ts similarity index 100% rename from src/events/gm/tile/GmTileUpload.ts rename to src/events/gm/tile/Upload.ts diff --git a/src/events/gm/zone/GmZoneEditorZoneCreate.ts b/src/events/gm/zone/Create.ts similarity index 100% rename from src/events/gm/zone/GmZoneEditorZoneCreate.ts rename to src/events/gm/zone/Create.ts diff --git a/src/events/gm/zone/GmZoneEditorZoneDelete.ts b/src/events/gm/zone/Delete.ts similarity index 100% rename from src/events/gm/zone/GmZoneEditorZoneDelete.ts rename to src/events/gm/zone/Delete.ts diff --git a/src/events/gm/zone/GmZoneEditorZoneList.ts b/src/events/gm/zone/List.ts similarity index 100% rename from src/events/gm/zone/GmZoneEditorZoneList.ts rename to src/events/gm/zone/List.ts diff --git a/src/events/gm/zone/GmZoneEditorZoneRequest.ts b/src/events/gm/zone/Request.ts similarity index 100% rename from src/events/gm/zone/GmZoneEditorZoneRequest.ts rename to src/events/gm/zone/Request.ts diff --git a/src/events/gm/zone/GmZoneEditorZoneUpdate.ts b/src/events/gm/zone/Update.ts similarity index 97% rename from src/events/gm/zone/GmZoneEditorZoneUpdate.ts rename to src/events/gm/zone/Update.ts index 819f084..34974f9 100644 --- a/src/events/gm/zone/GmZoneEditorZoneUpdate.ts +++ b/src/events/gm/zone/Update.ts @@ -10,6 +10,7 @@ interface IPayload { width: number height: number tiles: string[][] + pvp: boolean zoneEventTiles: ZoneEventTile[] zoneObjects: ZoneObject[] } @@ -41,6 +42,8 @@ export default function (socket: TSocket, io: Server) { return } + console.log(data); + await prisma.zone.update({ where: { id: data.zoneId @@ -50,6 +53,7 @@ export default function (socket: TSocket, io: Server) { width: data.width, height: data.height, tiles: data.tiles, + pvp: data.pvp, zoneEventTiles: { deleteMany: { zoneId: data.zoneId // Ensure only event tiles related to the zone are deleted