From 7e8fcc766a342bda3b3d267bb55bbb10082231d7 Mon Sep 17 00:00:00 2001
From: Dennis Postma <dennis@directonline.io>
Date: Sat, 21 Dec 2024 02:59:44 +0100
Subject: [PATCH] Minor improvements

---
 src/repositories/characterHairRepository.ts   |  2 +-
 src/repositories/characterRepository.ts       | 24 +++++++++++++++----
 .../charactersScreen/character_hair_list.ts   |  2 +-
 src/socketEvents/character/create.ts          |  1 -
 src/utilities/http.ts                         |  2 ++
 src/utilities/types.ts                        |  2 ++
 6 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/repositories/characterHairRepository.ts b/src/repositories/characterHairRepository.ts
index 77b17b4..da42794 100644
--- a/src/repositories/characterHairRepository.ts
+++ b/src/repositories/characterHairRepository.ts
@@ -5,7 +5,7 @@ class CharacterHairRepository {
   async getAll(): Promise<CharacterHair[]> {
     return prisma.characterHair.findMany()
   }
-  async getIsEnabledForCharCreationHair(): Promise<CharacterHair[]> {
+  async getAllSelectable(): Promise<CharacterHair[]> {
     return prisma.characterHair.findMany({
       where: {
         isSelectable: true
diff --git a/src/repositories/characterRepository.ts b/src/repositories/characterRepository.ts
index a34fdef..5f8d245 100644
--- a/src/repositories/characterRepository.ts
+++ b/src/repositories/characterRepository.ts
@@ -17,7 +17,11 @@ class CharacterRepository {
           },
           characterHair: {
             include: {
-              sprite: true
+              sprite: {
+                include: {
+                  spriteActions: true
+                }
+              }
             }
           }
         }
@@ -45,7 +49,11 @@ class CharacterRepository {
           },
           characterHair: {
             include: {
-              sprite: true
+              sprite: {
+                include: {
+                  spriteActions: true
+                }
+              }
             }
           }
         }
@@ -72,7 +80,11 @@ class CharacterRepository {
           },
           characterHair: {
             include: {
-              sprite: true
+              sprite: {
+                include: {
+                  spriteActions: true
+                }
+              }
             }
           }
         }
@@ -99,7 +111,11 @@ class CharacterRepository {
           },
           characterHair: {
             include: {
-              sprite: true
+              sprite: {
+                include: {
+                  spriteActions: true
+                }
+              }
             }
           }
         }
diff --git a/src/socketEvents/character/charactersScreen/character_hair_list.ts b/src/socketEvents/character/charactersScreen/character_hair_list.ts
index 2796997..33c5577 100644
--- a/src/socketEvents/character/charactersScreen/character_hair_list.ts
+++ b/src/socketEvents/character/charactersScreen/character_hair_list.ts
@@ -16,7 +16,7 @@ export default class characterHairListEvent {
   }
 
   private async handleEvent(data: IPayload, callback: (response: CharacterHair[]) => void): Promise<void> {
-    const items = await characterHairRepository.getIsEnabledForCharCreationHair()
+    const items = await characterHairRepository.getAllSelectable()
     callback(items)
   }
 }
diff --git a/src/socketEvents/character/create.ts b/src/socketEvents/character/create.ts
index 2a886c2..349d2e0 100644
--- a/src/socketEvents/character/create.ts
+++ b/src/socketEvents/character/create.ts
@@ -18,7 +18,6 @@ export default class CharacterCreateEvent {
   }
 
   private async handleCharacterCreate(data: any): Promise<any> {
-    console.log('character:create requested', data)
     // zod validate
     try {
       data = ZCharacterCreate.parse(data)
diff --git a/src/utilities/http.ts b/src/utilities/http.ts
index 832dfbe..48a3d9e 100644
--- a/src/utilities/http.ts
+++ b/src/utilities/http.ts
@@ -185,6 +185,8 @@ async function addHttpRoutes(app: Application) {
         data: '/assets/sprites/' + sprite.id + '/' + spriteAction.action + '.png',
         group: spriteAction.isAnimated ? 'sprite_animations' : 'sprites',
         updatedAt: sprite.updatedAt,
+        originX: Number(spriteAction.originX.toString()),
+        originY: Number(spriteAction.originY.toString()),
         isAnimated: spriteAction.isAnimated,
         frameCount: JSON.parse(JSON.stringify(spriteAction.sprites)).length,
         frameWidth: spriteAction.frameWidth,
diff --git a/src/utilities/types.ts b/src/utilities/types.ts
index d979e46..1a8b914 100644
--- a/src/utilities/types.ts
+++ b/src/utilities/types.ts
@@ -30,6 +30,8 @@ export type AssetData = {
   data: string
   group: 'tiles' | 'objects' | 'sprites' | 'sprite_animations' | 'sound' | 'music' | 'ui' | 'font' | 'other'
   updatedAt: Date
+  originX?: number
+  originY?: number
   isAnimated?: boolean
   frameCount?: number
   frameWidth?: number