famous last words: fuck (changing ORM)

prisma/migrations/20241224142532_init/migration.sql

@@ -151,10 +151,9 @@ CREATE TABLE `CharacterItem` (
 -- CreateTable
 CREATE TABLE `CharacterEquipment` (
     `id` INTEGER NOT NULL AUTO_INCREMENT,
-    `characterId` INTEGER NOT NULL,
-    `itemId` VARCHAR(191) NOT NULL,
-    `quantity` INTEGER NOT NULL,
     `slot` ENUM('HEAD', 'BODY', 'ARMS', 'LEGS', 'NECK', 'RING') NOT NULL,
+    `characterId` INTEGER NOT NULL,
+    `characterItemId` INTEGER NOT NULL,
 
     PRIMARY KEY (`id`)
 ) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
@@ -291,7 +290,7 @@ ALTER TABLE `CharacterItem` ADD CONSTRAINT `CharacterItem_itemId_fkey` FOREIGN K
 ALTER TABLE `CharacterEquipment` ADD CONSTRAINT `CharacterEquipment_characterId_fkey` FOREIGN KEY (`characterId`) REFERENCES `Character`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;
 
 -- AddForeignKey
-ALTER TABLE `CharacterEquipment` ADD CONSTRAINT `CharacterEquipment_itemId_fkey` FOREIGN KEY (`itemId`) REFERENCES `Item`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `CharacterEquipment` ADD CONSTRAINT `CharacterEquipment_characterItemId_fkey` FOREIGN KEY (`characterItemId`) REFERENCES `CharacterItem`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;
 
 -- AddForeignKey
 ALTER TABLE `ZoneEffect` ADD CONSTRAINT `ZoneEffect_zoneId_fkey` FOREIGN KEY (`zoneId`) REFERENCES `Zone`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;

prisma/schema/game.prisma

@@ -54,7 +54,6 @@ model Item {
   createdAt   DateTime        @default(now())
   updatedAt   DateTime        @updatedAt
   characters  CharacterItem[]
-  equipment   CharacterEquipment[]
 }
 
 enum ItemType {

prisma/schema/user.prisma

@@ -97,16 +97,16 @@ model CharacterItem {
   itemId             String
   item               Item                 @relation(fields: [itemId], references: [id], onDelete: Cascade)
   quantity           Int
+  CharacterEquipment CharacterEquipment[]
 }
 
 model CharacterEquipment {
   id              Int                        @id @default(autoincrement())
+  slot            CharacterEquipmentSlotType
   characterId     Int
   character       Character                  @relation(fields: [characterId], references: [id], onDelete: Cascade)
-  itemId      String
+  characterItemId Int
-  item        Item                       @relation(fields: [itemId], references: [id], onDelete: Cascade)
+  characterItem   CharacterItem              @relation(fields: [characterItemId], references: [id], onDelete: Cascade)
-  quantity    Int
-  slot        CharacterEquipmentSlotType
 }
 
 enum CharacterEquipmentSlotType {

src/repositories/characterRepository.ts

@@ -23,6 +23,11 @@ class CharacterRepository {
                 }
               }
             }
+          },
+          equipment: {
+            include: {
+              item: true
+            }
           }
         }
       })
@@ -55,6 +60,11 @@ class CharacterRepository {
                 }
               }
             }
+          },
+          equipment: {
+            include: {
+              item: true
+            }
           }
         }
       })
@@ -86,6 +96,11 @@ class CharacterRepository {
                 }
               }
             }
+          },
+          equipment: {
+            include: {
+              item: true
+            }
           }
         }
       })
@@ -117,6 +132,11 @@ class CharacterRepository {
                 }
               }
             }
+          },
+          equipment: {
+            include: {
+              item: true
+            }
           }
         }
       })

src/socketEvents/gameMaster/assetManager/sprite/update.ts

@@ -158,9 +158,12 @@ export default class SpriteUpdateEvent {
     const processedInput = await sharp(buffer)
       .ensureAlpha()
       .resize({
+        width: frameWidth,  // Set maximum width
+        height: frameHeight, // Set maximum height
+        fit: 'inside',      // Ensure image fits within dimensions
         kernel: sharp.kernel.nearest,
-        fit: 'contain',
+        position: 'center',
-        position: 'center'
+        withoutEnlargement: true // Don't enlarge smaller images
       })
       .png({
         compressionLevel: 9,